From b91148251fe6960e6ece4a032ca71201fc66ac1e Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 1 Oct 2021 12:20:58 +0200
Subject: [PATCH] spns #18704 DB9 - embed gcc 8.5 - native gcc is not fully
 c++17 compliant

---
 applications/SALOME-master-MPI.pyconf | 14 ++++++++++++++
 applications/SALOME-master.pyconf     |  9 +++++++++
 products/Python.pyconf                |  1 +
 products/cmake.pyconf                 |  1 +
 products/gcc.pyconf                   |  8 ++++++--
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 8bf05d4..6abf3e8 100644
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -47,6 +47,10 @@ APPLICATION :
         embree : '3.12.2'
         freeimage : '3.16.0'
         freetype : '2.9.1'
+        gcc  :  '8.5.0'
+        mpc : 'native'
+        gmp : 'native'
+        mpfr : 'native'
         gmsh : '4.1.4'
         graphviz : '2.38.0'
         hdf5 : {tag : '1.10.3', hpc : 'yes'}
@@ -179,5 +183,15 @@ APPLICATION :
 }
 __overwrite__ :
 [
+  {
+   __condition__ : "VARS.dist in ['FD32']"
+   # https://github.com/scipy/scipy/issues/11611
+   'APPLICATION.products.scipy' : '1.5.2'
+  }
+  {
+   __condition__ : "VARS.dist not in ['DB09']"
+   # https://github.com/scipy/scipy/issues/11611
+   'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+  }
 ]
 
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 10dc377..e2ed91a 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -47,6 +47,10 @@ APPLICATION :
         embree : '3.12.2'
         freeimage : '3.16.0'
         freetype : '2.9.1'
+        gcc  :  '8.5.0'
+        mpc : 'native'
+        gmp : 'native'
+        mpfr : 'native'
         gmsh : '4.1.4'
         graphviz : '2.38.0'
         hdf5 : '1.10.3'
@@ -182,4 +186,9 @@ __overwrite__ :
    # https://github.com/scipy/scipy/issues/11611
    'APPLICATION.products.scipy' : '1.5.2'
   }
+  {
+   __condition__ : "VARS.dist not in ['DB09']"
+   # https://github.com/scipy/scipy/issues/11611
+   'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+  }
 ]
diff --git a/products/Python.pyconf b/products/Python.pyconf
index cae3736..cceda4d 100755
--- a/products/Python.pyconf
+++ b/products/Python.pyconf
@@ -18,6 +18,7 @@ default :
        env_script : $name + ".py"
     }
     depend : []
+    opt_depend: ["gcc"]
     patches : []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
diff --git a/products/cmake.pyconf b/products/cmake.pyconf
index 25952e4..a14208d 100644
--- a/products/cmake.pyconf
+++ b/products/cmake.pyconf
@@ -17,6 +17,7 @@ default :
        env_script : $name + ".py"
     }
     depend : []
+    opt_depend: ["gcc"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     install_dir : 'base'
diff --git a/products/gcc.pyconf b/products/gcc.pyconf
index 2246772..e077dff 100644
--- a/products/gcc.pyconf
+++ b/products/gcc.pyconf
@@ -19,8 +19,12 @@ default :
     }
 }
 
+version_8_5_0:
+{
+    compil_script : 'gcc-8.5.0.sh'
+}
+
 version_6_3_0:
 {
     compil_script : 'gcc-6.3.0.sh'
-
-}
\ No newline at end of file
+}
-- 
2.39.2