UB22.04: ensure that Python 3.6.5 is patched as it should be

diff --git a/applications/MEDCOUPLING-9.10.0-MPI.pyconf b/applications/MEDCOUPLING-9.10.0-MPI.pyconf
index 7bf28ae6b7fd722f0ae1c542e18f6da50ad2102c..9690c7dd5006ae05be31836792b857ca0d8f97b9 100644 (file)
--- a/applications/MEDCOUPLING-9.10.0-MPI.pyconf
+++ b/applications/MEDCOUPLING-9.10.0-MPI.pyconf
@@ -113,5 +113,6 @@ __overwrite__ :
         # 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'
+        'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_UB22_04'}
     }
 ]

diff --git a/applications/MEDCOUPLING-master-MPI.pyconf b/applications/MEDCOUPLING-master-MPI.pyconf
index f1e9f0f979a97e8bd27d3afaf33414d52e7c55c9..9802f5be06cc050fe97899e80b77963a93d8407b 100644 (file)
--- a/applications/MEDCOUPLING-master-MPI.pyconf
+++ b/applications/MEDCOUPLING-master-MPI.pyconf
@@ -113,5 +113,6 @@ __overwrite__ :
         # 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'
+        'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_UB22_04'}
     }
 ]

diff --git a/products/Python.pyconf b/products/Python.pyconf
index fc70b292a8a6b13b09bc63d8e271b2f1569d84fc..b1e71ca0c462c7afa450aab9b6cc212d8f22dc3b 100755 (executable)
--- a/products/Python.pyconf
+++ b/products/Python.pyconf
@@ -45,6 +45,11 @@ version_3_6_5 :
  patches : []
 }
 
+version_3_6_5_UB22_04:
+{
+  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
@@ -73,6 +78,11 @@ version_3_6_15_FD34:
   patches: ["python_3.6.15-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889
 }
 
+version_3_6_15_UB22_04:
+{
+  patches: ["python_3.6.15-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889
+}
+
 version_3_6_15_win :
 {
     compil_script : "Python-3.6.15.bat"