summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoguchi-k <55966120+noguchi-k@users.noreply.github.com>2020-01-29 05:59:23 +0900
committerAdam J. Stewart <ajstewart426@gmail.com>2020-01-28 14:59:23 -0600
commitda091c0cf5eff1a9254c3a4988ed54f34f263cae (patch)
tree778525dc77be4005950d242297de7488fdb2c86e
parent16da648d03564871ade5fcce09dc45171b706b8c (diff)
downloadspack-da091c0cf5eff1a9254c3a4988ed54f34f263cae.tar.gz
spack-da091c0cf5eff1a9254c3a4988ed54f34f263cae.tar.bz2
spack-da091c0cf5eff1a9254c3a4988ed54f34f263cae.tar.xz
spack-da091c0cf5eff1a9254c3a4988ed54f34f263cae.zip
med: add a space between literal and identifier (#14646)
-rw-r--r--var/spack/repos/builtin/packages/med/add_space.patch20
-rw-r--r--var/spack/repos/builtin/packages/med/package.py3
2 files changed, 23 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/med/add_space.patch b/var/spack/repos/builtin/packages/med/add_space.patch
new file mode 100644
index 0000000000..e757742529
--- /dev/null
+++ b/var/spack/repos/builtin/packages/med/add_space.patch
@@ -0,0 +1,20 @@
+--- spack-src/tools/medimport/2.3.1/MED231champRefInfoEtRenMaabuilt.cxx.org 2020-01-28 16:02:49.656440054 +0900
++++ spack-src/tools/medimport/2.3.1/MED231champRefInfoEtRenMaabuilt.cxx 2020-01-28 16:03:45.222261190 +0900
+@@ -95,7 +95,7 @@
+ SSCRUTE(maai); goto ERROR;
+ }
+ if ( MAJ_231_232_chaine(maai,maaf) ) {
+- fprintf(stdout," >>> Normalisation du nom de maillage par défaut [%s] associé au champ [%s] pour (n°dt,n°it) ("IFORMAT","IFORMAT")\n",maai,champ,numdt,numo);
++ fprintf(stdout," >>> Normalisation du nom de maillage par défaut [%s] associé au champ [%s] pour (n°dt,n°it) (" IFORMAT "," IFORMAT ")\n",maai,champ,numdt,numo);
+ ret = _MEDattrStringEcrire(datagroup2,MED_NOM_MAI,MED_TAILLE_NOM,maaf);
+ EXIT_IF(ret < 0,"Renommage du maillage en",maaf);
+ fprintf(stdout," >>> Normalisation du nom du maillage par défaut [%s] ... OK ... \n",maaf);
+@@ -120,7 +120,7 @@
+
+ if ( MAJ_231_232_chaine(maa,maaf) ) {
+
+- fprintf(stdout," >>> Normalisation du nom de maillage [%s] associé au champ [%s] pour (n°dt,n°it) ("IFORMAT","IFORMAT")\n",maa,champ,numdt,numo);
++ fprintf(stdout," >>> Normalisation du nom de maillage [%s] associé au champ [%s] pour (n°dt,n°it) (" IFORMAT "," IFORMAT ")\n",maa,champ,numdt,numo);
+ /* on accede au maillage */
+ strcpy(chemini,chemin);
+ strcat(chemini,maa);
diff --git a/var/spack/repos/builtin/packages/med/package.py b/var/spack/repos/builtin/packages/med/package.py
index 591a31e923..3b416c0274 100644
--- a/var/spack/repos/builtin/packages/med/package.py
+++ b/var/spack/repos/builtin/packages/med/package.py
@@ -22,6 +22,9 @@ class Med(CMakePackage):
depends_on('mpi')
depends_on('hdf5@:1.8.19+mpi')
+ # C++11 requires a space between literal and identifier
+ patch('add_space.patch')
+
# FIXME This is minimal installation.
def cmake_args(self):