Merge pull request easybuilders#20062 from Flamefire/20240307102053_n…

…ew_pr_GRASS783

Fix confgure options in GRASS

easybuild/easyconfigs/g/GRASS/GRASS-7.8.3-fosscuda-2019b-Python-3.7.4.eb

@@ -41,7 +41,6 @@ dependencies = [
     ('PROJ', '6.2.1'),
     ('SQLite', '3.29.0'),
     ('freetype', '2.10.1'),
-    ('FFmpeg', '4.2.1'),
     ('LibTIFF', '4.0.10'),
     ('cairo', '1.16.0'),
     ('X11', '20190717'),
@@ -52,21 +51,18 @@ dependencies = [
 ]
 
 preconfigopts = "sed -e 's/-lblas/$LIBBLAS/g' -e 's/-llapack/$LIBLAPACK/g' -i configure && "
-configopts = '--enable-64bit '
-configopts += '--enable-largefile=yes '
+configopts = '--enable-largefile=yes '
 configopts += '--with-cairo=yes '
 configopts += '--with-cxx '
-configopts += '--with-ffmpeg --with-ffmpeg-libs=$EBROOTFFMPEG/lib --with-ffmpeg-includes=$EBROOTFFMPEG/include/* '
 configopts += '--with-fftw --with-fftw-libs=$EBROOTFFTW/lib --with-fftw-includes=$EBROOTFFTW/include '
 configopts += '--with-freetype '
 configopts += '--with-freetype-libs=$EBROOTFREETYPE/lib --with-freetype-includes=$EBROOTFREETYPE/include '
 configopts += '--with-geos=$EBROOTGEOS/bin/geos-config '
-configopts += '--without-glw '
 configopts += '--with-lapack '
-configopts += '--with-lapack-lib=$LAPACK_LIB_DIR '
+configopts += '--with-lapack-libs=$LAPACK_LIB_DIR '
 configopts += '--with-lapack-includes=$LAPACK_INC_DIR '
 configopts += '--with-blas '
-configopts += '--with-blas-lib=$BLAS_LIB_DIR '
+configopts += '--with-blas-libs=$BLAS_LIB_DIR '
 configopts += '--with-blas-includes=$BLAS_INC_DIR '
 configopts += '--with-netcdf=$EBROOTNETCDF/bin/nc-config '
 configopts += '--without-odbc '
@@ -75,19 +71,17 @@ configopts += '--with-openmp '
 configopts += '--with-png '
 configopts += '--with-png-libs="$EBROOTLIBPNG/lib $EBROOTZLIB/lib" --with-png-includes=$EBROOTLIBPNG/include '
 configopts += '--without-postgres '
-configopts += '--with-proj --with-proj-libs=$EBROOTPROJ/lib '
+configopts += '--with-proj-libs=$EBROOTPROJ/lib '
 configopts += '--with-proj-includes=$EBROOTPROJ/include --with-proj-share=$EBROOTPROJ/share/proj '
 configopts += '--with-pthread '
-configopts += '--with-python '
 configopts += '--with-readline '
 configopts += '--with-readline-libs=$EBROOTLIBREADLINE/lib --with-readline-includes=$EBROOTLIBREADLINE/include '
-configopts += '--with-spatialite '
 configopts += '--with-sqlite '
 configopts += '--with-tiff-libs=$EBROOTLIBTIFF/lib --with-tiff-includes=$EBROOTLIBTIFF/include '
 configopts += '--with-wxwidgets=$EBROOTWXPYTHON/bin/wx-config '
 configopts += '--with-x '
-configopts += '--with-zlib --with-zlib-libs=$EBROOTZLIB/lib --with-zlib-includes=$EBROOTZLIB/include '
-configopts += '--with-bzlib --with-bzlib-libs=$EBROOTBZIP2/lib --with-ibzlib-includes=$EBROOTBZIP2/include '
+configopts += '--with-zlib-libs=$EBROOTZLIB/lib --with-zlib-includes=$EBROOTZLIB/include '
+configopts += '--with-bzlib --with-bzlib-libs=$EBROOTBZIP2/lib --with-bzlib-includes=$EBROOTBZIP2/include '
 configopts += '--with-zstd --with-zstd-libs=$EBROOTZSTD/lib --with-zstd-includes=$EBROOTZSTD/include '
 
 sanity_check_paths = {

easybuild/easyconfigs/g/GRASS/GRASS-8.2.0-foss-2021b.eb

@@ -40,7 +40,6 @@ dependencies = [
     ('PROJ', '8.1.0'),
     ('SQLite', '3.36'),
     ('freetype', '2.11.0'),
-    ('FFmpeg', '4.3.2'),
     ('LibTIFF', '4.3.0'),
     ('cairo', '1.16.0'),
     ('X11', '20210802'),
@@ -52,21 +51,18 @@ dependencies = [
 
 preconfigopts = "sed -e 's/-lblas/$LIBBLAS/g' -e 's/-llapack/$LIBLAPACK/g' -i configure && "
 
-configopts = '--enable-64bit '
-configopts += '--enable-largefile=yes '
+configopts = '--enable-largefile=yes '
 configopts += '--with-cairo=yes '
 configopts += '--with-cxx '
-configopts += '--with-ffmpeg --with-ffmpeg-libs=$EBROOTFFMPEG/lib --with-ffmpeg-includes=$EBROOTFFMPEG/include/* '
 configopts += '--with-fftw --with-fftw-libs=$EBROOTFFTW/lib --with-fftw-includes=$EBROOTFFTW/include '
 configopts += '--with-freetype '
 configopts += '--with-freetype-libs=$EBROOTFREETYPE/lib --with-freetype-includes=$EBROOTFREETYPE/include '
 configopts += '--with-geos=$EBROOTGEOS/bin/geos-config '
-configopts += '--without-glw '
 configopts += '--with-lapack '
-configopts += '--with-lapack-lib=$LAPACK_LIB_DIR '
+configopts += '--with-lapack-libs=$LAPACK_LIB_DIR '
 configopts += '--with-lapack-includes=$LAPACK_INC_DIR '
 configopts += '--with-blas '
-configopts += '--with-blas-lib=$BLAS_LIB_DIR '
+configopts += '--with-blas-libs=$BLAS_LIB_DIR '
 configopts += '--with-blas-includes=$BLAS_INC_DIR '
 configopts += '--with-netcdf=$EBROOTNETCDF/bin/nc-config '
 configopts += '--without-odbc '
@@ -75,19 +71,17 @@ configopts += '--with-openmp '
 configopts += '--with-png '
 configopts += '--with-png-libs="$EBROOTLIBPNG/lib $EBROOTZLIB/lib" --with-png-includes=$EBROOTLIBPNG/include '
 configopts += '--without-postgres '
-configopts += '--with-proj --with-proj-libs=$EBROOTPROJ/lib '
+configopts += '--with-proj-libs=$EBROOTPROJ/lib '
 configopts += '--with-proj-includes=$EBROOTPROJ/include --with-proj-share=$EBROOTPROJ/share/proj '
 configopts += '--with-pthread '
-configopts += '--with-python '
 configopts += '--with-readline '
 configopts += '--with-readline-libs=$EBROOTLIBREADLINE/lib --with-readline-includes=$EBROOTLIBREADLINE/include '
-configopts += '--with-spatialite '
 configopts += '--with-sqlite '
 configopts += '--with-tiff-libs=$EBROOTLIBTIFF/lib --with-tiff-includes=$EBROOTLIBTIFF/include '
 configopts += '--with-wxwidgets=$EBROOTWXWIDGET/bin/wx-config '
 configopts += '--with-x '
-configopts += '--with-zlib --with-zlib-libs=$EBROOTZLIB/lib --with-zlib-includes=$EBROOTZLIB/include '
-configopts += '--with-bzlib --with-bzlib-libs=$EBROOTBZIP2/lib --with-ibzlib-includes=$EBROOTBZIP2/include '
+configopts += '--with-zlib-libs=$EBROOTZLIB/lib --with-zlib-includes=$EBROOTZLIB/include '
+configopts += '--with-bzlib --with-bzlib-libs=$EBROOTBZIP2/lib --with-bzlib-includes=$EBROOTBZIP2/include '
 configopts += '--with-zstd --with-zstd-libs=$EBROOTZSTD/lib --with-zstd-includes=$EBROOTZSTD/include '
 
 postinstallcmds = [