add gdal patch section

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index d9f378cb6e012bf4e13a4643cc47b0f554af59ba..9c0fe2d8e7629ab69d5b495d3aa1a05a14bcc418 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -65,7 +65,7 @@ APPLICATION :
         mpc : 'native'
         gmp : 'native'
         mpfr : 'native'
-        gdal : '2.4.0'
+        gdal : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0' }
         gmsh : '4.10.3'
         graphviz : '2.38.0'
         hdf5 : '1.10.3'
@@ -238,14 +238,11 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['CO7']"
         'APPLICATION.rm_products'         : ['gcc', 'gmp', 'mpc', 'mpfr']
-        'APPLICATION.products.gdal'       : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO7' }
         'APPLICATION.products.openturns'  : {tag: '1.21',  base: 'no', section: 'version_1_21_CO7' }
-        #'APPLICATION.products.boost'     : {tag: '1.71.0',  base: 'no', section: 'version_1_71_0_CO7' }
     }
     {
         __condition__ : "VARS.dist in ['CO8']"
         '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
         'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
         'APPLICATION.products.openturns'  : {tag: '1.21',  base: 'no', section: 'version_1_21_CO8' }
     }

diff --git a/products/gdal.pyconf b/products/gdal.pyconf
index 6d84e6d83695f4c601f71803f190ef3504cc80a9..644c398f8a0650536d0e4b4a3ce537f38d0dc89e 100644 (file)
--- a/products/gdal.pyconf
+++ b/products/gdal.pyconf
@@ -40,6 +40,7 @@ version_2_4_4:
 version_2_4_0:
 {
     compil_script :  'gdal-2.4.0' + $VARS.scriptExtension
+    patches : ["gdal.0003-ignore_use2to3.patch"]
 }
 
 version_2_4_0_FD34:
@@ -59,7 +60,6 @@ version_2_4_0_CO8:
     compil_script :  'gdal-2.4.0.sh'
     patches : ["gdal.0001-r2000.patch",
                "gdal.0002-GNUmakefile-tooLongLine.patch",
-               "gdal.0003-ignore_use2to3.patch"
               ]
 }