From 53585cf98a9d7484bcfd252535674ac035d9ac48 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Thu, 8 Aug 2024 17:14:26 +0100 Subject: [PATCH 1/2] disable use of MySQL in GDAL --- easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb | 2 ++ easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb | 2 +- easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.eb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb b/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb index a527795dfc3..831b5465ec1 100644 --- a/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb +++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb @@ -61,8 +61,10 @@ dependencies = [ # common configopts for static, shared library builds _base_configopts = ' '.join([ '-DGDAL_USE_INTERNAL_LIBS=OFF', + '-DArrow_DIR=$EBROOTARROW', '-DGEOTIFF_INCLUDE_DIR=$EBROOTLIBGEOTIFF/include', '-DPython_ROOT=$EBROOTPYTHON', + '-DGDAL_USE_MYSQL=OFF', ]) # iterative build for both static and shared libraries diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb b/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb index df1c21eb72a..ad4ea255ed2 100644 --- a/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb +++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb @@ -61,7 +61,7 @@ dependencies = [ ] # iterative build for both static and shared libraries -local_configopts_common = "-DGDAL_USE_INTERNAL_LIBS=OFF " +local_configopts_common = "-DGDAL_USE_INTERNAL_LIBS=OFF -DArrow_DIR=$EBROOTARROW -DGDAL_USE_MYSQL=OFF " local_configopts_common += "-DGEOTIFF_INCLUDE_DIR=$EBROOTLIBGEOTIFF/include -DPython_ROOT=$EBROOTPYTHON " configopts = [ diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.eb b/easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.eb index ba67862143a..21299457516 100644 --- a/easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.eb +++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.eb @@ -60,7 +60,7 @@ dependencies = [ ] # iterative build for both static and shared libraries -local_configopts_common = "-DGDAL_USE_INTERNAL_LIBS=OFF " +local_configopts_common = "-DGDAL_USE_INTERNAL_LIBS=OFF -DGDAL_USE_MYSQL=OFF " local_configopts_common += "-DGEOTIFF_INCLUDE_DIR=$EBROOTLIBGEOTIFF/include -DPython_ROOT=$EBROOTPYTHON " configopts = [ From 06bcdf1fa9f8f722b9dddf61dd9458e0f1202def Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Thu, 8 Aug 2024 17:16:41 +0100 Subject: [PATCH 2/2] remove accidental change, as based this on EB5 --- easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb | 1 - easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb b/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb index 831b5465ec1..576d90e74d6 100644 --- a/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb +++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb @@ -61,7 +61,6 @@ dependencies = [ # common configopts for static, shared library builds _base_configopts = ' '.join([ '-DGDAL_USE_INTERNAL_LIBS=OFF', - '-DArrow_DIR=$EBROOTARROW', '-DGEOTIFF_INCLUDE_DIR=$EBROOTLIBGEOTIFF/include', '-DPython_ROOT=$EBROOTPYTHON', '-DGDAL_USE_MYSQL=OFF', diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb b/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb index ad4ea255ed2..88e35cd4db4 100644 --- a/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb +++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb @@ -61,7 +61,7 @@ dependencies = [ ] # iterative build for both static and shared libraries -local_configopts_common = "-DGDAL_USE_INTERNAL_LIBS=OFF -DArrow_DIR=$EBROOTARROW -DGDAL_USE_MYSQL=OFF " +local_configopts_common = "-DGDAL_USE_INTERNAL_LIBS=OFF -DGDAL_USE_MYSQL=OFF " local_configopts_common += "-DGEOTIFF_INCLUDE_DIR=$EBROOTLIBGEOTIFF/include -DPython_ROOT=$EBROOTPYTHON " configopts = [