Merge pull request #20487 from lexming/cmake-libdir-clean

remove `CMAKE_INSTALL_LIBDIR` settings from `configopts` + add test to enfore use of `install_libdir` instead
easybuilders · Jul 3, 2024 · e2b1af1 · e2b1af1
2 parents b5be2a3 + 6c8eb62
commit e2b1af1
Show file tree

Hide file tree

Showing 54 changed files with 50 additions and 112 deletions.
diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-0.17.1-foss-2020a-Python-3.8.2.eb b/easybuild/easyconfigs/a/Arrow/Arrow-0.17.1-foss-2020a-Python-3.8.2.eb
@@ -39,7 +39,7 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON"
+configopts += "-DPython3_ROOT_DIR=$EBROOTPYTHON"
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-0.17.1-foss-2020b.eb b/easybuild/easyconfigs/a/Arrow/Arrow-0.17.1-foss-2020b.eb
@@ -36,7 +36,7 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/python/development.html
 configopts = "-DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON"
+configopts += "-DPython3_ROOT_DIR=$EBROOTPYTHON"
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-0.17.1-fosscuda-2020b.eb b/easybuild/easyconfigs/a/Arrow/Arrow-0.17.1-fosscuda-2020b.eb
@@ -40,7 +40,7 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON"
+configopts += "-DPython3_ROOT_DIR=$EBROOTPYTHON"
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-0.17.1-intel-2020a-Python-3.8.2.eb b/easybuild/easyconfigs/a/Arrow/Arrow-0.17.1-intel-2020a-Python-3.8.2.eb
@@ -37,7 +37,7 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON"
+configopts += "-DPython3_ROOT_DIR=$EBROOTPYTHON"
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-0.17.1-intel-2020b.eb b/easybuild/easyconfigs/a/Arrow/Arrow-0.17.1-intel-2020b.eb
@@ -36,7 +36,7 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON"
+configopts += "-DPython3_ROOT_DIR=$EBROOTPYTHON"
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-11.0.0-gfbf-2022b.eb b/easybuild/easyconfigs/a/Arrow/Arrow-11.0.0-gfbf-2022b.eb
@@ -45,9 +45,8 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_DATASET=on -DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON "
 configopts += "-DARROW_WITH_ZLIB=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_ZSTD=ON -DARROW_WITH_LZ4=ON "
-configopts += "-DZSTD_ROOT=$EBROOTZSTD "
+configopts += "-DZSTD_ROOT=$EBROOTZSTD -DPython3_ROOT_DIR=$EBROOTPYTHON "
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-14.0.1-gfbf-2023a.eb b/easybuild/easyconfigs/a/Arrow/Arrow-14.0.1-gfbf-2023a.eb
@@ -40,9 +40,8 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_DATASET=on -DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON "
 configopts += "-DARROW_WITH_ZLIB=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_ZSTD=ON -DARROW_WITH_LZ4=ON "
-configopts += "-DZSTD_ROOT=$EBROOTZSTD "
+configopts += "-DZSTD_ROOT=$EBROOTZSTD -DPython3_ROOT_DIR=$EBROOTPYTHON "
 
 # install Python bindings
 _pyarrow_preinstall_opts = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-6.0.0-foss-2021a.eb b/easybuild/easyconfigs/a/Arrow/Arrow-6.0.0-foss-2021a.eb
@@ -40,8 +40,8 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_DATASET=on -DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON "
 configopts += "-DARROW_WITH_ZLIB=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_ZSTD=ON -DARROW_WITH_LZ4=ON "
+configopts += "-DPython3_ROOT_DIR=$EBROOTPYTHON "
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-6.0.0-foss-2021b.eb b/easybuild/easyconfigs/a/Arrow/Arrow-6.0.0-foss-2021b.eb
@@ -40,8 +40,8 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_DATASET=on -DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON "
 configopts += "-DARROW_WITH_ZLIB=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_ZSTD=ON -DARROW_WITH_LZ4=ON "
+configopts += "-DPython3_ROOT_DIR=$EBROOTPYTHON "
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-6.0.1-foss-2021a.eb b/easybuild/easyconfigs/a/Arrow/Arrow-6.0.1-foss-2021a.eb
@@ -40,8 +40,8 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_DATASET=on -DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON "
 configopts += "-DARROW_WITH_ZLIB=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_ZSTD=ON -DARROW_WITH_LZ4=ON "
+configopts += "-DPython3_ROOT_DIR=$EBROOTPYTHON "
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-8.0.0-foss-2021a.eb b/easybuild/easyconfigs/a/Arrow/Arrow-8.0.0-foss-2021a.eb
@@ -45,9 +45,8 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_DATASET=on -DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON "
 configopts += "-DARROW_WITH_ZLIB=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_ZSTD=ON -DARROW_WITH_LZ4=ON "
-configopts += "-DZSTD_ROOT=$EBROOTZSTD "
+configopts += "-DZSTD_ROOT=$EBROOTZSTD -DPython3_ROOT_DIR=$EBROOTPYTHON "
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-8.0.0-foss-2021b.eb b/easybuild/easyconfigs/a/Arrow/Arrow-8.0.0-foss-2021b.eb
@@ -45,9 +45,8 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_DATASET=on -DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON "
 configopts += "-DARROW_WITH_ZLIB=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_ZSTD=ON -DARROW_WITH_LZ4=ON "
-configopts += "-DZSTD_ROOT=$EBROOTZSTD "
+configopts += "-DZSTD_ROOT=$EBROOTZSTD -DPython3_ROOT_DIR=$EBROOTPYTHON "
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-8.0.0-foss-2022.05.eb b/easybuild/easyconfigs/a/Arrow/Arrow-8.0.0-foss-2022.05.eb
@@ -45,9 +45,8 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_DATASET=on -DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON "
 configopts += "-DARROW_WITH_ZLIB=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_ZSTD=ON -DARROW_WITH_LZ4=ON "
-configopts += "-DZSTD_ROOT=$EBROOTZSTD "
+configopts += "-DZSTD_ROOT=$EBROOTZSTD -DPython3_ROOT_DIR=$EBROOTPYTHON "
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-8.0.0-foss-2022a.eb b/easybuild/easyconfigs/a/Arrow/Arrow-8.0.0-foss-2022a.eb
@@ -45,9 +45,8 @@ start_dir = 'cpp'
 
 # see https://arrow.apache.org/docs/developers/python.html
 configopts = "-DARROW_DATASET=on -DARROW_PYTHON=on -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib -DPython3_ROOT_DIR=$EBROOTPYTHON "
 configopts += "-DARROW_WITH_ZLIB=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_ZSTD=ON -DARROW_WITH_LZ4=ON "
-configopts += "-DZSTD_ROOT=$EBROOTZSTD "
+configopts += "-DZSTD_ROOT=$EBROOTZSTD -DPython3_ROOT_DIR=$EBROOTPYTHON "
 
 # also install Python bindings
 local_install_pyarrow_cmds = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "

diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.7.0-intel-2020a.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.7.0-intel-2020a.eb
@@ -29,7 +29,7 @@ dependencies = [
 
 separate_build_dir = True
 
-local_common_configopts = "-DCMAKE_INSTALL_LIBDIR=lib -DICB=ON -DMPI=ON -DEXAMPLES=ON"
+local_common_configopts = "-DICB=ON -DMPI=ON -DEXAMPLES=ON"
 
 # perform iterative build to get both static and shared libraries
 configopts = [

diff --git a/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-10.2.0.eb b/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-10.2.0.eb
@@ -29,9 +29,6 @@ preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(versio
 
 configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
 
-# make sure that libraries end up in <prefix>/lib (not lib64)
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
-
 buildopts = "BROTLI_DIR=$EBROOTBROTLI BROTLI_INCLUDE=$EBROOTBROTLI/include"
 
 # also install dbrunsli binary and missing libraries

diff --git a/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-10.3.0.eb b/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-10.3.0.eb
@@ -30,9 +30,6 @@ preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(versio
 
 configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
 
-# make sure that libraries end up in <prefix>/lib (not lib64)
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
-
 buildopts = "BROTLI_DIR=$EBROOTBROTLI BROTLI_INCLUDE=$EBROOTBROTLI/include"
 
 # also install dbrunsli binary and missing libraries

diff --git a/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-11.3.0.eb b/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-11.3.0.eb
@@ -30,9 +30,6 @@ preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(versio
 
 configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
 
-# make sure that libraries end up in <prefix>/lib (not lib64)
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
-
 buildopts = "BROTLI_DIR=$EBROOTBROTLI BROTLI_INCLUDE=$EBROOTBROTLI/include"
 
 # also install dbrunsli binary and missing libraries

diff --git a/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-12.2.0.eb b/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-12.2.0.eb
@@ -30,9 +30,6 @@ preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(versio
 
 configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
 
-# make sure that libraries end up in <prefix>/lib (not lib64)
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
-
 buildopts = "BROTLI_DIR=$EBROOTBROTLI BROTLI_INCLUDE=$EBROOTBROTLI/include"
 
 # also install dbrunsli binary and missing libraries

diff --git a/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-12.3.0.eb b/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-12.3.0.eb
@@ -30,9 +30,6 @@ preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(versio
 
 configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
 
-# make sure that libraries end up in <prefix>/lib (not lib64)
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
-
 buildopts = "BROTLI_DIR=$EBROOTBROTLI BROTLI_INCLUDE=$EBROOTBROTLI/include"
 
 # also install dbrunsli binary and missing libraries

diff --git a/easybuild/easyconfigs/f/Faiss/Faiss-1.7.4-foss-2023a-CUDA-12.1.1.eb b/easybuild/easyconfigs/f/Faiss/Faiss-1.7.4-foss-2023a-CUDA-12.1.1.eb
@@ -43,7 +43,6 @@ _copts = [
     '-DPython_EXECUTABLE="${EBROOTPYTHON}/bin/python"',
     '-DCUDAToolkit_ROOT="${CUDA_ROOT}"',
     '-DCMAKE_CUDA_ARCHITECTURES="%(cuda_cc_cmake)s"',
-    '-DCMAKE_INSTALL_LIBDIR=%(installdir)s/lib',
 ]
 
 configopts = ' '.join(_copts)

diff --git a/easybuild/easyconfigs/f/flatbuffers/flatbuffers-2.0.7-GCCcore-11.3.0.eb b/easybuild/easyconfigs/f/flatbuffers/flatbuffers-2.0.7-GCCcore-11.3.0.eb
@@ -29,8 +29,7 @@ dependencies = [
     ('Python', '3.10.4'),
 ]
 
-# Install into the same dir as the Python extension which is /lib
-configopts = '-DFLATBUFFERS_ENABLE_PCH=ON -DCMAKE_INSTALL_LIBDIR=lib'
+configopts = '-DFLATBUFFERS_ENABLE_PCH=ON'
 
 exts_defaultclass = 'PythonPackage'
 exts_default_options = {

diff --git a/easybuild/easyconfigs/l/LERC/LERC-3.0-GCCcore-10.2.0.eb b/easybuild/easyconfigs/l/LERC/LERC-3.0-GCCcore-10.2.0.eb
@@ -21,8 +21,6 @@ builddependencies = [
     ('CMake', '3.18.4'),
 ]
 
-configopts = '-DCMAKE_INSTALL_LIBDIR=lib'
-
 postinstallcmds = [
     # copy the LercTest source file to a LercTest subdir in the installation directory and compile it
     # (needs to be done here instead of in the sanity check, else it won't work when RPATH linking is enabled)

diff --git a/easybuild/easyconfigs/l/LERC/LERC-3.0-GCCcore-10.3.0.eb b/easybuild/easyconfigs/l/LERC/LERC-3.0-GCCcore-10.3.0.eb
@@ -22,8 +22,6 @@ builddependencies = [
     ('CMake', '3.20.1'),
 ]
 
-configopts = '-DCMAKE_INSTALL_LIBDIR=lib'
-
 postinstallcmds = [
     # copy the LercTest source file to a LercTest subdir in the installation directory and compile it
     # (needs to be done here instead of in the sanity check, else it won't work when RPATH linking is enabled)

diff --git a/easybuild/easyconfigs/l/LERC/LERC-4.0.0-GCCcore-11.3.0.eb b/easybuild/easyconfigs/l/LERC/LERC-4.0.0-GCCcore-11.3.0.eb
@@ -22,8 +22,6 @@ builddependencies = [
     ('CMake', '3.23.1'),
 ]
 
-configopts = '-DCMAKE_INSTALL_LIBDIR=lib'
-
 postinstallcmds = [
     # copy the LercTest source file to a LercTest subdir in the installation directory and compile it
     # (needs to be done here instead of in the sanity check, else it won't work when RPATH linking is enabled)

diff --git a/easybuild/easyconfigs/l/LERC/LERC-4.0.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/l/LERC/LERC-4.0.0-GCCcore-12.2.0.eb
@@ -22,8 +22,6 @@ builddependencies = [
     ('CMake', '3.24.3'),
 ]
 
-configopts = '-DCMAKE_INSTALL_LIBDIR=lib'
-
 postinstallcmds = [
     # copy the LercTest source file to a LercTest subdir in the installation directory and compile it
     # (needs to be done here instead of in the sanity check, else it won't work when RPATH linking is enabled)

diff --git a/easybuild/easyconfigs/l/LERC/LERC-4.0.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/l/LERC/LERC-4.0.0-GCCcore-12.3.0.eb
@@ -22,8 +22,6 @@ builddependencies = [
     ('CMake', '3.26.3'),
 ]
 
-configopts = '-DCMAKE_INSTALL_LIBDIR=lib'
-
 postinstallcmds = [
     # copy the LercTest source file to a LercTest subdir in the installation directory and compile it
     # (needs to be done here instead of in the sanity check, else it won't work when RPATH linking is enabled)

diff --git a/easybuild/easyconfigs/l/LERC/LERC-4.0.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/LERC/LERC-4.0.0-GCCcore-13.2.0.eb
@@ -22,8 +22,6 @@ builddependencies = [
     ('CMake', '3.27.6'),
 ]
 
-configopts = '-DCMAKE_INSTALL_LIBDIR=lib'
-
 postinstallcmds = [
     # copy the LercTest source file to a LercTest subdir in the installation directory and compile it
     # (needs to be done here instead of in the sanity check, else it won't work when RPATH linking is enabled)

diff --git a/easybuild/easyconfigs/l/Lab-Streaming-Layer/Lab-Streaming-Layer-1.16.2-GCCcore-12.3.0.eb b/easybuild/easyconfigs/l/Lab-Streaming-Layer/Lab-Streaming-Layer-1.16.2-GCCcore-12.3.0.eb
@@ -25,8 +25,6 @@ dependencies = [
     ('Python', '3.11.3'),
 ]
 
-configopts = "-DCMAKE_INSTALL_LIBDIR=lib"
-
 exts_defaultclass = 'PythonPackage'
 exts_default_options = {
 }

diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.0.4-GCCcore-9.3.0.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.0.4-GCCcore-9.3.0.eb
@@ -27,11 +27,7 @@ dependencies = [
     ('NASM', '2.14.02'),
 ]
 
-# make sure that libraries are installed to <prefix>/lib (instead of <prefix>/lib64),
-# which helps with avoiding problems when libjpeg-turbo is a dependency that
-# gets linked via RPATH and Meson/Ninja are involved,
-# see https://github.com/easybuilders/easybuild-easyconfigs/issues/16256
-configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR:PATH=lib'
+configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1'
 
 runtest = "test"
 

diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.0.5-GCCcore-10.2.0.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.0.5-GCCcore-10.2.0.eb
@@ -27,11 +27,7 @@ dependencies = [
     ('NASM', '2.15.05'),
 ]
 
-# make sure that libraries are installed to <prefix>/lib (instead of <prefix>/lib64),
-# which helps with avoiding problems when libjpeg-turbo is a dependency that
-# gets linked via RPATH and Meson/Ninja are involved,
-# see https://github.com/easybuilders/easybuild-easyconfigs/issues/16256
-configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR:PATH=lib'
+configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1'
 
 runtest = "test"
 

diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.0.6-GCCcore-10.3.0.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.0.6-GCCcore-10.3.0.eb
@@ -27,11 +27,7 @@ dependencies = [
     ('NASM', '2.15.05'),
 ]
 
-# make sure that libraries are installed to <prefix>/lib (instead of <prefix>/lib64),
-# which helps with avoiding problems when libjpeg-turbo is a dependency that
-# gets linked via RPATH and Meson/Ninja are involved,
-# see https://github.com/easybuilders/easybuild-easyconfigs/issues/16256
-configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR:PATH=lib'
+configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1'
 
 runtest = "test"
 

diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.0.6-GCCcore-11.2.0.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.0.6-GCCcore-11.2.0.eb
@@ -27,11 +27,7 @@ dependencies = [
     ('NASM', '2.15.05'),
 ]
 
-# make sure that libraries are installed to <prefix>/lib (instead of <prefix>/lib64),
-# which helps with avoiding problems when libjpeg-turbo is a dependency that
-# gets linked via RPATH and Meson/Ninja are involved,
-# see https://github.com/easybuilders/easybuild-easyconfigs/issues/16256
-configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR:PATH=lib'
+configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1'
 
 runtest = "test"
 

diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.1.3-GCCcore-11.3.0.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.1.3-GCCcore-11.3.0.eb
@@ -27,11 +27,7 @@ dependencies = [
     ('NASM', '2.15.05'),
 ]
 
-# make sure that libraries are installed to <prefix>/lib (instead of <prefix>/lib64),
-# which helps with avoiding problems when libjpeg-turbo is a dependency that
-# gets linked via RPATH and Meson/Ninja are involved,
-# see https://github.com/easybuilders/easybuild-easyconfigs/issues/16256
-configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR:PATH=lib'
+configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1'
 
 runtest = "test"
 

diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.1.4-GCCcore-12.2.0.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.1.4-GCCcore-12.2.0.eb
@@ -27,11 +27,7 @@ dependencies = [
     ('NASM', '2.15.05'),
 ]
 
-# make sure that libraries are installed to <prefix>/lib (instead of <prefix>/lib64),
-# which helps with avoiding problems when libjpeg-turbo is a dependency that
-# gets linked via RPATH and Meson/Ninja are involved,
-# see https://github.com/easybuilders/easybuild-easyconfigs/issues/16256
-configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR:PATH=lib'
+configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1'
 
 runtest = "test"
 

diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.1.5.1-GCCcore-12.3.0.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-2.1.5.1-GCCcore-12.3.0.eb
@@ -27,11 +27,7 @@ dependencies = [
     ('NASM', '2.16.01'),
 ]
 
-# make sure that libraries are installed to <prefix>/lib (instead of <prefix>/lib64),
-# which helps with avoiding problems when libjpeg-turbo is a dependency that
-# gets linked via RPATH and Meson/Ninja are involved,
-# see https://github.com/easybuilders/easybuild-easyconfigs/issues/16256
-configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR:PATH=lib'
+configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1'
 
 runtest = "test"
 

diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-3.0.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-3.0.1-GCCcore-13.2.0.eb
@@ -27,11 +27,7 @@ dependencies = [
     ('NASM', '2.16.01'),
 ]
 
-# make sure that libraries are installed to <prefix>/lib (instead of <prefix>/lib64),
-# which helps with avoiding problems when libjpeg-turbo is a dependency that
-# gets linked via RPATH and Meson/Ninja are involved,
-# see https://github.com/easybuilders/easybuild-easyconfigs/issues/16256
-configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR:PATH=lib'
+configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1'
 
 runtest = "test"
 

diff --git a/easybuild/easyconfigs/o/OpenMEEG/OpenMEEG-2.5.7-foss-2023a.eb b/easybuild/easyconfigs/o/OpenMEEG/OpenMEEG-2.5.7-foss-2023a.eb
@@ -32,7 +32,6 @@ dependencies = [
 ]
 
 configopts = "-DENABLE_PYTHON=on -DPython3_ROOT_DIR=$EBROOTPYTHON "
-configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
 
 _om_binaries = [
     'om_assemble', 'om_forward', 'om_geometry_info', 'om_matrix_convert', 'om_mesh_concat', 'om_mesh_info',