MEDCOUPLING: boost 1.71 on Ubuntu F36 & FD37

diff --git a/applications/MEDCOUPLING-9.10.0-MPI.pyconf b/applications/MEDCOUPLING-9.10.0-MPI.pyconf
index 1a661f289144ddf888f9d584cceec07ab06f02cd..b56f76ff35e0762273dcca7ddebb550442a04a93 100644 (file)
--- a/applications/MEDCOUPLING-9.10.0-MPI.pyconf
+++ b/applications/MEDCOUPLING-9.10.0-MPI.pyconf
@@ -95,13 +95,31 @@ __overwrite__ :
         'APPLICATION.products.scipy' : '1.5.2'
     }
     {
-        __condition__: "VARS.dist in ['FD34', 'FD36', 'FD37']"
+        __condition__: "VARS.dist in ['FD34']"
         # gcc https://github.com/scipy/scipy/issues/11611
         # either patch numpy to include -fallow-argument-mismatch or move to that version
         'APPLICATION.products.scipy' : '1.5.2'
         # https://github.com/pyenv/pyenv/issues/1889
         'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_FD34'}
     }
+    {
+        __condition__: "VARS.dist in ['FD36']"
+        # gcc https://github.com/scipy/scipy/issues/11611
+        # either patch numpy to include -fallow-argument-mismatch or move to that version
+        'APPLICATION.products.scipy' : '1.5.2'
+        # https://github.com/pyenv/pyenv/issues/1889
+        'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_FD36'}
+        'APPLICATION.products.boost'  : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_FD36'}
+    }
+    {
+        __condition__: "VARS.dist in ['FD37']"
+        # gcc https://github.com/scipy/scipy/issues/11611
+        # either patch numpy to include -fallow-argument-mismatch or move to that version
+        'APPLICATION.products.scipy' : '1.5.2'
+        # https://github.com/pyenv/pyenv/issues/1889
+        'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_FD37'}
+        'APPLICATION.products.boost'  : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_FD37'}
+    }
     {
         __condition__ : "VARS.dist in ['DB11']"
         # gcc https://github.com/scipy/scipy/issues/11611

diff --git a/products/Python.pyconf b/products/Python.pyconf
index b1e71ca0c462c7afa450aab9b6cc212d8f22dc3b..ca4be1b830a832237f0056b92bc7b3c840d77806 100755 (executable)
--- a/products/Python.pyconf
+++ b/products/Python.pyconf
@@ -50,6 +50,16 @@ version_3_6_5_UB22_04:
   patches: ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889
 }
 
+version_3_6_5_FD37:
+{
+  patches: ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889
+}
+
+version_3_6_5_FD36:
+{
+  patches: ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889
+}
+
 version_3_6_5_FD34:
 {
   patches: ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889

diff --git a/products/boost.pyconf b/products/boost.pyconf
index 550778d1b90a3eb4ae42b186235c25303035d65f..85ed6a45ba47644dad7e171b5efdde82bc4f574c 100644 (file)
--- a/products/boost.pyconf
+++ b/products/boost.pyconf
@@ -45,6 +45,18 @@ version_1_71_0_UB22_04 :
     patches : ['boost-1.71-pthread-gcc-11.patch']
 }
 
+version_1_71_0_FD37 :
+{
+    compil_script : "boost-1.71.0.sh"
+    patches : ['boost-1.71-pthread-gcc-11.patch']
+}
+
+version_1_71_0_FD36 :
+{
+    compil_script : "boost-1.71.0.sh"
+    patches : ['boost-1.71-pthread-gcc-11.patch']
+}
+
 version_1_52_0 :
 {
     patches :