From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 8 Apr 2022 14:45:40 +0000 (+0200)
Subject: Update non native job
X-Git-Tag: V9_9_0~97
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=79b7f32b58a9f6718ab8f2a6b303e28dc336c557;p=tools%2Fsat_salome.git

Update non native job
---

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 8023e3a..d062eb1 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -213,6 +213,7 @@ __overwrite__ :
         # https://github.com/scipy/scipy/issues/11611
         'APPLICATION.products.scipy' : '1.5.2'
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'} # spns #29324
     }
     {
         __condition__ : "VARS.dist in ['CO7']"
@@ -220,12 +221,13 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.rm_products'  : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.rm_products'  : ['gcc', 'gmp', 'mpc', 'mpfr', 'zeromq']
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'} # spns #29324
     }
     {
         __condition__ : "VARS.dist in ['DB10']"
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_DB10'} # spns #29324
     }
     {
         __condition__ : "VARS.dist in ['UB18.04']"
@@ -234,6 +236,7 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['UB20.04']"
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_UB20_0_4'} # spns #29324
     }
 
     {
diff --git a/products/gdal.pyconf b/products/gdal.pyconf
index 9662ad7..628ea0e 100644
--- a/products/gdal.pyconf
+++ b/products/gdal.pyconf
@@ -56,3 +56,19 @@ version_2_4_0_CO8:
                "gdal.0002-GNUmakefile-tooLongLine.patch"
               ]
 }
+
+version_2_4_0_DB10:
+{
+    compil_script :  'gdal-2.4.0.sh'
+    patches : ["gdal.0001-r2000.patch",
+               "gdal.0002-GNUmakefile-tooLongLine.patch"
+              ]
+}
+
+version_2_4_0_UB20_0_4:
+{
+    compil_script :  'gdal-2.4.0.sh'
+    patches : ["gdal.0001-r2000.patch",
+               "gdal.0002-GNUmakefile-tooLongLine.patch"
+              ]
+}