From da091c0cf5eff1a9254c3a4988ed54f34f263cae Mon Sep 17 00:00:00 2001
From: noguchi-k <55966120+noguchi-k@users.noreply.github.com>
Date: Wed, 29 Jan 2020 05:59:23 +0900
Subject: med: add a space between literal and identifier (#14646)

---
 var/spack/repos/builtin/packages/med/add_space.patch | 20 ++++++++++++++++++++
 var/spack/repos/builtin/packages/med/package.py      |  3 +++
 2 files changed, 23 insertions(+)
 create mode 100644 var/spack/repos/builtin/packages/med/add_space.patch

(limited to 'var')

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):
-- 
cgit v1.2.3-70-g09d2