From 62f20ce01da77f0d424da2c1cd3d0dde7aedcd1d Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 8 Oct 2021 11:57:01 +0200
Subject: [PATCH] bos #18711: FC30 uses embedded gcc 9.3.0

---
 applications/SALOME-master-MPI.pyconf   |  9 +++++++++
 applications/SALOME-master-int32.pyconf | 13 +++++++++++++
 applications/SALOME-master.pyconf       |  7 ++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index d0f9ae0..38e67bf 100644
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -192,5 +192,14 @@ __overwrite__ :
    __condition__ : "VARS.dist not in ['DB09']"
    'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
   }
+  {
+   __condition__ : "VARS.dist in ['FD30']"
+   # https://github.com/scipy/scipy/issues/11611
+   'APPLICATION.products.gcc' : '9.3.0'
+  }
+  {
+   __condition__ : "VARS.dist not in ['DB09', 'FD30']"
+   'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+  }
 ]
 
diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf
index 8654415..7cfd263 100644
--- a/applications/SALOME-master-int32.pyconf
+++ b/applications/SALOME-master-int32.pyconf
@@ -44,6 +44,10 @@ APPLICATION :
         embree : '3.3.0'
         freeimage : '3.16.0'
         freetype : '2.9.1'
+        gcc  :  '8.5.0'
+        mpc : 'native'
+        gmp : 'native'
+        mpfr : 'native'
         gmsh : '4.8.4'
         graphviz : '2.38.0'
         hdf5 : '1.10.3'
@@ -220,4 +224,13 @@ __overwrite__ :
                                                  'pv_coincident.patch'
                                                 ]
   }
+  {
+   __condition__ : "VARS.dist in ['FD30']"
+   # https://github.com/scipy/scipy/issues/11611
+   'APPLICATION.products.gcc' : '9.3.0'
+  }
+  {
+   __condition__ : "VARS.dist not in ['DB09', 'FD30']"
+   'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+  }
 ]
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 2bd0626..9e7136b 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -187,7 +187,12 @@ __overwrite__ :
    'APPLICATION.products.scipy' : '1.5.2'
   }
   {
-   __condition__ : "VARS.dist not in ['DB09']"
+   __condition__ : "VARS.dist in ['FD30']"
+   # https://github.com/scipy/scipy/issues/11611
+   'APPLICATION.products.gcc' : '9.3.0'
+  }
+  {
+   __condition__ : "VARS.dist not in ['DB09', 'FD30']"
    'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
   }
 ]
-- 
2.39.2