From 9a05e22c2a162d52a37ff4f9e798af5d5cd6cddd Mon Sep 17 00:00:00 2001 From: Matthias Krack Date: Wed, 16 Nov 2022 11:14:48 +0100 Subject: [PATCH] Adapt linker syntax for MacOS Linux accepts as linker syntax both `-rpath=` and `-rpath,`, but MacOS (clang) works only with `-rpath,`. --- tools/toolchain/scripts/stage0/install_gcc.sh | 4 ++-- tools/toolchain/scripts/stage0/install_intel.sh | 2 +- tools/toolchain/scripts/stage1/install_intelmpi.sh | 2 +- tools/toolchain/scripts/stage1/install_mpich.sh | 4 ++-- tools/toolchain/scripts/stage1/install_openmpi.sh | 4 ++-- tools/toolchain/scripts/stage2/install_acml.sh | 2 +- tools/toolchain/scripts/stage2/install_mkl.sh | 2 +- tools/toolchain/scripts/stage2/install_openblas.sh | 4 ++-- tools/toolchain/scripts/stage3/install_fftw.sh | 4 ++-- tools/toolchain/scripts/stage3/install_libxc.sh | 4 ++-- tools/toolchain/scripts/stage4/install_cosma.sh | 8 ++++---- tools/toolchain/scripts/stage4/install_libxsmm.sh | 4 ++-- tools/toolchain/scripts/stage4/install_scalapack.sh | 4 ++-- tools/toolchain/scripts/stage5/install_elpa.sh | 4 ++-- tools/toolchain/scripts/stage5/install_pexsi.sh | 2 +- tools/toolchain/scripts/stage5/install_ptscotch.sh | 4 ++-- tools/toolchain/scripts/stage5/install_superlu.sh | 4 ++-- tools/toolchain/scripts/stage6/install_gsl.sh | 4 ++-- tools/toolchain/scripts/stage6/install_plumed.sh | 4 ++-- tools/toolchain/scripts/stage6/install_quip.sh | 4 ++-- tools/toolchain/scripts/stage7/install_hdf5.sh | 2 +- tools/toolchain/scripts/stage7/install_libvdwxc.sh | 4 ++-- tools/toolchain/scripts/stage7/install_libvori.sh | 4 ++-- tools/toolchain/scripts/stage7/install_spglib.sh | 4 ++-- tools/toolchain/scripts/stage8/install_sirius.sh | 12 ++++++------ tools/toolchain/scripts/stage8/install_spfft.sh | 6 +++--- tools/toolchain/scripts/stage8/install_spla.sh | 8 ++++---- tools/toolchain/scripts/tool_kit.sh | 4 +++- 28 files changed, 60 insertions(+), 58 deletions(-) diff --git a/tools/toolchain/scripts/stage0/install_gcc.sh b/tools/toolchain/scripts/stage0/install_gcc.sh index 3f5f64c992..87a157d2cc 100755 --- a/tools/toolchain/scripts/stage0/install_gcc.sh +++ b/tools/toolchain/scripts/stage0/install_gcc.sh @@ -112,7 +112,7 @@ case "${with_gcc}" in F90="${FC}" F77="${FC}" GCC_CFLAGS="-I'${pkg_install_dir}/include'" - GCC_LDFLAGS="-L'${pkg_install_dir}/lib64' -L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib64' -Wl,-rpath='${pkg_install_dir}/lib64'" + GCC_LDFLAGS="-L'${pkg_install_dir}/lib64' -L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib64' -Wl,-rpath,'${pkg_install_dir}/lib64'" ;; __SYSTEM__) echo "==================== Finding GCC from system paths ====================" @@ -140,7 +140,7 @@ case "${with_gcc}" in F90="${FC}" F77="${FC}" GCC_CFLAGS="-I'${pkg_install_dir}/include'" - GCC_LDFLAGS="-L'${pkg_install_dir}/lib64' -L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib64' -Wl,-rpath='${pkg_install_dir}/lib64'" + GCC_LDFLAGS="-L'${pkg_install_dir}/lib64' -L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib64' -Wl,-rpath,'${pkg_install_dir}/lib64'" ;; esac if [ "${ENABLE_TSAN}" = "__TRUE__" ]; then diff --git a/tools/toolchain/scripts/stage0/install_intel.sh b/tools/toolchain/scripts/stage0/install_intel.sh index a297d38d2e..fe7eac9c76 100755 --- a/tools/toolchain/scripts/stage0/install_intel.sh +++ b/tools/toolchain/scripts/stage0/install_intel.sh @@ -49,7 +49,7 @@ case "${with_intel}" in F90="${FC}" F77="${FC}" INTEL_CFLAGS="-I'${pkg_install_dir}/include'" - INTEL_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + INTEL_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "${with_intel}" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage1/install_intelmpi.sh b/tools/toolchain/scripts/stage1/install_intelmpi.sh index a9af4ab737..a89db7a77c 100755 --- a/tools/toolchain/scripts/stage1/install_intelmpi.sh +++ b/tools/toolchain/scripts/stage1/install_intelmpi.sh @@ -70,7 +70,7 @@ case "${with_intelmpi}" in MPIF77="${MPIFC}" # include path is already handled by compiler wrapper scripts (can cause wrong mpi.mod with GNU Fortran) #INTELMPI_CFLAGS="-I'${pkg_install_dir}/include'" - INTELMPI_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + INTELMPI_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "${with_intelmpi}" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage1/install_mpich.sh b/tools/toolchain/scripts/stage1/install_mpich.sh index cdb084c9ce..83f385101c 100755 --- a/tools/toolchain/scripts/stage1/install_mpich.sh +++ b/tools/toolchain/scripts/stage1/install_mpich.sh @@ -75,7 +75,7 @@ case "${with_mpich}" in MPIF90="${MPIFC}" MPIF77="${MPIFC}" MPICH_CFLAGS="-I'${pkg_install_dir}/include'" - MPICH_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + MPICH_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding MPICH from system paths ====================" @@ -111,7 +111,7 @@ case "${with_mpich}" in MPIF90="${MPIFC}" MPIF77="${MPIFC}" MPICH_CFLAGS="-I'${pkg_install_dir}/include'" - MPICH_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + MPICH_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "${with_mpich}" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage1/install_openmpi.sh b/tools/toolchain/scripts/stage1/install_openmpi.sh index f2a829e677..fbb60dcb01 100755 --- a/tools/toolchain/scripts/stage1/install_openmpi.sh +++ b/tools/toolchain/scripts/stage1/install_openmpi.sh @@ -80,7 +80,7 @@ case "${with_openmpi}" in MPIF90="${MPIFC}" MPIF77="${MPIFC}" OPENMPI_CFLAGS="-I'${pkg_install_dir}/include'" - OPENMPI_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + OPENMPI_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding OpenMPI from system paths ====================" @@ -111,7 +111,7 @@ case "${with_openmpi}" in MPIF90="${MPIFC}" MPIF77="${MPIFC}" OPENMPI_CFLAGS="-I'${pkg_install_dir}/include'" - OPENMPI_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + OPENMPI_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "${with_openmpi}" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage2/install_acml.sh b/tools/toolchain/scripts/stage2/install_acml.sh index 7cd3a06f59..1cd17cd6b0 100755 --- a/tools/toolchain/scripts/stage2/install_acml.sh +++ b/tools/toolchain/scripts/stage2/install_acml.sh @@ -39,7 +39,7 @@ case "$with_acml" in pkg_install_dir="$with_acml" check_dir "${pkg_install_dir}/lib" ACML_CFLAGS="-I'${pkg_install_dir}/include'" - ACML_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + ACML_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_acml" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage2/install_mkl.sh b/tools/toolchain/scripts/stage2/install_mkl.sh index bd3bfd49c3..4fa9cae174 100755 --- a/tools/toolchain/scripts/stage2/install_mkl.sh +++ b/tools/toolchain/scripts/stage2/install_mkl.sh @@ -95,7 +95,7 @@ if [ "${with_mkl}" != "__DONTUSE__" ]; then esac # set the correct lib flags from MLK link adviser - MKL_LIBS="-L${mkl_lib_dir} -Wl,-rpath=${mkl_lib_dir} ${mkl_scalapack_lib}" + MKL_LIBS="-L${mkl_lib_dir} -Wl,-rpath,${mkl_lib_dir} ${mkl_scalapack_lib}" MKL_LIBS+=" -Wl,--start-group -lmkl_gf_lp64 -lmkl_sequential -lmkl_core" MKL_LIBS+=" ${mkl_blacs_lib} -Wl,--end-group -lpthread -lm -ldl" # setup_mkl disables using separate FFTW library (see below) diff --git a/tools/toolchain/scripts/stage2/install_openblas.sh b/tools/toolchain/scripts/stage2/install_openblas.sh index 7469029b9d..e4b4e1f017 100755 --- a/tools/toolchain/scripts/stage2/install_openblas.sh +++ b/tools/toolchain/scripts/stage2/install_openblas.sh @@ -104,7 +104,7 @@ case "${with_openblas}" in write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage2/$(basename ${SCRIPT_NAME})" fi OPENBLAS_CFLAGS="-I'${pkg_install_dir}/include'" - OPENBLAS_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + OPENBLAS_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" OPENBLAS_ROOT="${pkg_install_dir}" OPENBLAS_LIBS="-lopenblas" ;; @@ -127,7 +127,7 @@ case "${with_openblas}" in check_dir "${pkg_install_dir}/include" check_dir "${pkg_install_dir}/lib" OPENBLAS_CFLAGS="-I'${pkg_install_dir}/include'" - OPENBLAS_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + OPENBLAS_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" OPENBLAS_LIBS="-lopenblas" # detect separate omp builds (__libdir="${pkg_install_dir}/lib" LIB_PATHS="__libdir" check_lib -lopenblas_openmp 2> /dev/null) && diff --git a/tools/toolchain/scripts/stage3/install_fftw.sh b/tools/toolchain/scripts/stage3/install_fftw.sh index 0eb1bc0864..2657432f49 100755 --- a/tools/toolchain/scripts/stage3/install_fftw.sh +++ b/tools/toolchain/scripts/stage3/install_fftw.sh @@ -62,7 +62,7 @@ case "$with_fftw" in write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage3/$(basename ${SCRIPT_NAME})" fi FFTW_CFLAGS="-I'${pkg_install_dir}/include'" - FFTW_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + FFTW_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding FFTW from system paths ====================" @@ -81,7 +81,7 @@ case "$with_fftw" in check_dir "${pkg_install_dir}/lib" check_dir "${pkg_install_dir}/include" FFTW_CFLAGS="-I'${pkg_install_dir}/include'" - FFTW_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + FFTW_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_fftw" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage3/install_libxc.sh b/tools/toolchain/scripts/stage3/install_libxc.sh index 601e0c2e1e..833258f89f 100755 --- a/tools/toolchain/scripts/stage3/install_libxc.sh +++ b/tools/toolchain/scripts/stage3/install_libxc.sh @@ -48,7 +48,7 @@ case "$with_libxc" in write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage3/$(basename ${SCRIPT_NAME})" fi LIBXC_CFLAGS="-I'${pkg_install_dir}/include'" - LIBXC_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + LIBXC_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding LIBXC from system paths ====================" @@ -65,7 +65,7 @@ case "$with_libxc" in check_dir "${pkg_install_dir}/lib" check_dir "${pkg_install_dir}/include" LIBXC_CFLAGS="-I'${pkg_install_dir}/include'" - LIBXC_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + LIBXC_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_libxc" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage4/install_cosma.sh b/tools/toolchain/scripts/stage4/install_cosma.sh index 97e02e0aee..77111c7171 100755 --- a/tools/toolchain/scripts/stage4/install_cosma.sh +++ b/tools/toolchain/scripts/stage4/install_cosma.sh @@ -126,11 +126,11 @@ case "$with_cosma" in # Check if COSMA is compiled with 64bits and set up COSMA_LIBDIR accordingly. COSMA_LIBDIR="${pkg_install_dir}/lib" - COSMA_LDFLAGS="-L'${COSMA_LIBDIR}' -Wl,-rpath='${COSMA_LIBDIR}'" + COSMA_LDFLAGS="-L'${COSMA_LIBDIR}' -Wl,-rpath,'${COSMA_LIBDIR}'" COSMA_CUDA_LIBDIR="${pkg_install_dir}-cuda/lib" - COSMA_CUDA_LDFLAGS="-L'${COSMA_CUDA_LIBDIR}' -Wl,-rpath='${COSMA_CUDA_LIBDIR}'" + COSMA_CUDA_LDFLAGS="-L'${COSMA_CUDA_LIBDIR}' -Wl,-rpath,'${COSMA_CUDA_LIBDIR}'" COSMA_HIP_LIBDIR="${pkg_install_dir}-cuda/lib" - COSMA_HIP_LDFLAGS="-L'${COSMA_HIP_LIBDIR}' -Wl,-rpath='${COSMA_HIP_LIBDIR}'" + COSMA_HIP_LDFLAGS="-L'${COSMA_HIP_LIBDIR}' -Wl,-rpath,'${COSMA_HIP_LIBDIR}'" ;; __SYSTEM__) echo "==================== Finding COSMA from system paths ====================" @@ -152,7 +152,7 @@ case "$with_cosma" in check_dir "$pkg_install_dir/include" COSMA_CFLAGS="-I'${pkg_install_dir}/include'" - COSMA_LDFLAGS="-L'${COSMA_LIBDIR}' -Wl,-rpath='${COSMA_LIBDIR}'" + COSMA_LDFLAGS="-L'${COSMA_LIBDIR}' -Wl,-rpath,'${COSMA_LIBDIR}'" ;; esac if [ "$with_cosma" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage4/install_libxsmm.sh b/tools/toolchain/scripts/stage4/install_libxsmm.sh index 52ae9d1921..f2cf993095 100755 --- a/tools/toolchain/scripts/stage4/install_libxsmm.sh +++ b/tools/toolchain/scripts/stage4/install_libxsmm.sh @@ -73,7 +73,7 @@ EOF write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage4/$(basename ${SCRIPT_NAME})" fi LIBXSMM_CFLAGS="-I'${pkg_install_dir}/include'" - LIBXSMM_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + LIBXSMM_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding Libxsmm from system paths ====================" @@ -91,7 +91,7 @@ EOF check_dir "${pkg_install_dir}/include" check_dir "${pkg_install_dir}/lib" LIBXSMM_CFLAGS="-I'${pkg_install_dir}/include'" - LIBXSMM_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + LIBXSMM_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_libxsmm" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage4/install_scalapack.sh b/tools/toolchain/scripts/stage4/install_scalapack.sh index b1ebf998a0..db430fe161 100755 --- a/tools/toolchain/scripts/stage4/install_scalapack.sh +++ b/tools/toolchain/scripts/stage4/install_scalapack.sh @@ -66,7 +66,7 @@ case "$with_scalapack" in popd > /dev/null write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage4/$(basename ${SCRIPT_NAME})" fi - SCALAPACK_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + SCALAPACK_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding ScaLAPACK from system paths ====================" @@ -79,7 +79,7 @@ case "$with_scalapack" in echo "==================== Linking ScaLAPACK to user paths ====================" pkg_install_dir="$with_scalapack" check_dir "${pkg_install_dir}/lib" - SCALAPACK_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + SCALAPACK_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_scalapack" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage5/install_elpa.sh b/tools/toolchain/scripts/stage5/install_elpa.sh index 960f891cee..d88c1d110b 100755 --- a/tools/toolchain/scripts/stage5/install_elpa.sh +++ b/tools/toolchain/scripts/stage5/install_elpa.sh @@ -139,7 +139,7 @@ case "$with_elpa" in fi [ "$enable_openmp" != "yes" ] && elpa_dir_openmp="" ELPA_CFLAGS="-I'${pkg_install_dir}/IF_CUDA(nvidia|cpu)/include/elpa${elpa_dir_openmp}-${elpa_ver}/modules' -I'${pkg_install_dir}/IF_CUDA(nvidia|cpu)/include/elpa${elpa_dir_openmp}-${elpa_ver}/elpa'" - ELPA_LDFLAGS="-L'${pkg_install_dir}/IF_CUDA(nvidia|cpu)/lib' -Wl,-rpath='${pkg_install_dir}/IF_CUDA(nvidia|cpu)/lib'" + ELPA_LDFLAGS="-L'${pkg_install_dir}/IF_CUDA(nvidia|cpu)/lib' -Wl,-rpath,'${pkg_install_dir}/IF_CUDA(nvidia|cpu)/lib'" ;; __SYSTEM__) echo "==================== Finding ELPA from system paths ====================" @@ -173,7 +173,7 @@ case "$with_elpa" in echo "Cannot find elpa_openmp-* from path $user_include_path" exit 1 fi - ELPA_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + ELPA_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_elpa" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage5/install_pexsi.sh b/tools/toolchain/scripts/stage5/install_pexsi.sh index d740c34c26..e6eba61867 100755 --- a/tools/toolchain/scripts/stage5/install_pexsi.sh +++ b/tools/toolchain/scripts/stage5/install_pexsi.sh @@ -92,7 +92,7 @@ case "$with_pexsi" in fi PEXSI_CFLAGS="-I'${pkg_install_dir}/include'" - PEXSI_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + PEXSI_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding Pexsi_DIST from system paths ====================" diff --git a/tools/toolchain/scripts/stage5/install_ptscotch.sh b/tools/toolchain/scripts/stage5/install_ptscotch.sh index 52d3e1abfe..c2711c72ea 100755 --- a/tools/toolchain/scripts/stage5/install_ptscotch.sh +++ b/tools/toolchain/scripts/stage5/install_ptscotch.sh @@ -60,7 +60,7 @@ case "${with_ptscotch}" in write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage5/$(basename ${SCRIPT_NAME})" fi SCOTCH_CFLAGS="-I'${pkg_install_dir}/include'" - SCOTCH_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + SCOTCH_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding PT-Scotch from system paths ====================" @@ -82,7 +82,7 @@ case "${with_ptscotch}" in check_dir "${pkg_install_dir}/lib" check_dir "${pkg_install_dir}/include" SCOTCH_CFLAGS="-I'${pkg_install_dir}/include'" - SCOTCH_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + SCOTCH_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_ptscotch" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage5/install_superlu.sh b/tools/toolchain/scripts/stage5/install_superlu.sh index 1a67092499..477f841427 100755 --- a/tools/toolchain/scripts/stage5/install_superlu.sh +++ b/tools/toolchain/scripts/stage5/install_superlu.sh @@ -57,7 +57,7 @@ case "$with_superlu" in write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage5/$(basename ${SCRIPT_NAME})" fi SUPERLU_CFLAGS="-I'${pkg_install_dir}/include'" - SUPERLU_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + SUPERLU_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding SuperLU_DIST from system paths ====================" @@ -73,7 +73,7 @@ case "$with_superlu" in check_dir "${pkg_install_dir}/lib" check_dir "${pkg_install_dir}/include" SUPERLU_CFLAGS="-I'${pkg_install_dir}/include'" - SUPERLU_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + SUPERLU_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_superlu" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage6/install_gsl.sh b/tools/toolchain/scripts/stage6/install_gsl.sh index 9c7447697d..a6429ab395 100755 --- a/tools/toolchain/scripts/stage6/install_gsl.sh +++ b/tools/toolchain/scripts/stage6/install_gsl.sh @@ -48,7 +48,7 @@ case "$with_gsl" in fi GSL_CFLAGS="-I'${pkg_install_dir}/include'" - GSL_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + GSL_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding gsl from system paths ====================" @@ -65,7 +65,7 @@ case "$with_gsl" in check_dir "$pkg_install_dir/lib" check_dir "$pkg_install_dir/include" GSL_CFLAGS="-I'${pkg_install_dir}/include'" - GSL_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + GSL_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_gsl" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage6/install_plumed.sh b/tools/toolchain/scripts/stage6/install_plumed.sh index c031e34b54..d8e0c7b5a2 100755 --- a/tools/toolchain/scripts/stage6/install_plumed.sh +++ b/tools/toolchain/scripts/stage6/install_plumed.sh @@ -65,7 +65,7 @@ case "$with_plumed" in make install > install.log 2>&1 || tail -n ${LOG_LINES} install.log write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage6/$(basename ${SCRIPT_NAME})" fi - PLUMED_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + PLUMED_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding PLUMED from system paths ====================" @@ -78,7 +78,7 @@ case "$with_plumed" in echo "==================== Linking PLUMED to user paths ====================" pkg_install_dir="$with_plumed" check_dir "${pkg_install_dir}/lib" - PLUMED_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + PLUMED_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac diff --git a/tools/toolchain/scripts/stage6/install_quip.sh b/tools/toolchain/scripts/stage6/install_quip.sh index d5adab773e..d9167867d9 100755 --- a/tools/toolchain/scripts/stage6/install_quip.sh +++ b/tools/toolchain/scripts/stage6/install_quip.sh @@ -135,7 +135,7 @@ case "${with_quip}" in write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage6/$(basename ${SCRIPT_NAME})" fi QUIP_CFLAGS="-I'${pkg_install_dir}/include'" - QUIP_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + QUIP_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding Quip_DIST from system paths ====================" @@ -156,7 +156,7 @@ case "${with_quip}" in check_dir "${pkg_install_dir}/lib" check_dir "${pkg_install_dir}/include" QUIP_CFLAGS="-I'${pkg_install_dir}/include'" - QUIP_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + QUIP_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "${with_quip}" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage7/install_hdf5.sh b/tools/toolchain/scripts/stage7/install_hdf5.sh index 2a771a4967..95050a4a73 100755 --- a/tools/toolchain/scripts/stage7/install_hdf5.sh +++ b/tools/toolchain/scripts/stage7/install_hdf5.sh @@ -49,7 +49,7 @@ case "$with_hdf5" in fi HDF5_CFLAGS="-I${pkg_install_dir}/include" - HDF5_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + HDF5_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding hdf5 from system paths ====================" diff --git a/tools/toolchain/scripts/stage7/install_libvdwxc.sh b/tools/toolchain/scripts/stage7/install_libvdwxc.sh index 1c88d7ee99..2a5960f1e3 100755 --- a/tools/toolchain/scripts/stage7/install_libvdwxc.sh +++ b/tools/toolchain/scripts/stage7/install_libvdwxc.sh @@ -73,7 +73,7 @@ case "$with_libvdwxc" in write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage7/$(basename ${SCRIPT_NAME})" fi LIBVDWXC_CFLAGS="-I${pkg_install_dir}/include" - LIBVDWXC_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + LIBVDWXC_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding libvdwxc from system paths ====================" @@ -90,7 +90,7 @@ case "$with_libvdwxc" in check_dir "$pkg_install_dir/lib" check_dir "$pkg_install_dir/include" LIBVDWXC_CFLAGS="-I'${pkg_install_dir}/include'" - LIBVDWXC_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + LIBVDWXC_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_libvdwxc" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage7/install_libvori.sh b/tools/toolchain/scripts/stage7/install_libvori.sh index bef3d26eb9..ab83c9f6d7 100755 --- a/tools/toolchain/scripts/stage7/install_libvori.sh +++ b/tools/toolchain/scripts/stage7/install_libvori.sh @@ -55,7 +55,7 @@ case "${with_libvori:=__INSTALL__}" in write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage7/$(basename "${SCRIPT_NAME}")" fi - LIBVORI_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + LIBVORI_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; __SYSTEM__) echo "==================== Finding libvori from system paths ====================" @@ -73,7 +73,7 @@ case "${with_libvori:=__INSTALL__}" in [ -d "${pkg_install_dir}/lib64" ] && LIBVORI_LIBDIR="${pkg_install_dir}/lib64" check_dir "${LIBVORI_LIBDIR}" - LIBVORI_LDFLAGS="-L'${LIBVORI_LIBDIR}' -Wl,-rpath='${LIBVORI_LIBDIR}'" + LIBVORI_LDFLAGS="-L'${LIBVORI_LIBDIR}' -Wl,-rpath,'${LIBVORI_LIBDIR}'" ;; esac diff --git a/tools/toolchain/scripts/stage7/install_spglib.sh b/tools/toolchain/scripts/stage7/install_spglib.sh index 2df6451e26..cc150f7f96 100755 --- a/tools/toolchain/scripts/stage7/install_spglib.sh +++ b/tools/toolchain/scripts/stage7/install_spglib.sh @@ -54,7 +54,7 @@ case "$with_spglib" in fi SPGLIB_CFLAGS="-I${pkg_install_dir}/include" - SPGLIB_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + SPGLIB_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" if [ -d "${pkg_install_dir}/lib64" ]; then ln -sf lib64 ${pkg_install_dir}/lib cd ${pkg_install_dir} @@ -74,7 +74,7 @@ case "$with_spglib" in check_dir "$pkg_install_dir/lib" check_dir "$pkg_install_dir/include" SPGLIB_CFLAGS="-I'${pkg_install_dir}/include'" - SPGLIB_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + SPGLIB_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" ;; esac if [ "$with_spglib" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage8/install_sirius.sh b/tools/toolchain/scripts/stage8/install_sirius.sh index 8a7b00e734..98a222b750 100755 --- a/tools/toolchain/scripts/stage8/install_sirius.sh +++ b/tools/toolchain/scripts/stage8/install_sirius.sh @@ -183,11 +183,11 @@ case "$with_sirius" in install -d ${pkg_install_dir}/include/cuda install -m 644 src/*.a ${pkg_install_dir}/lib/cuda >> install.log 2>&1 install -m 644 src/mod_files/*.mod ${pkg_install_dir}/include/cuda >> install.log 2>&1 - SIRIUS_CUDA_LDFLAGS="-L'${pkg_install_dir}/lib/cuda' -Wl,-rpath='${pkg_install_dir}/lib/cuda'" + SIRIUS_CUDA_LDFLAGS="-L'${pkg_install_dir}/lib/cuda' -Wl,-rpath,'${pkg_install_dir}/lib/cuda'" cd .. fi SIRIUS_CFLAGS="-I'${pkg_install_dir}/include/cuda'" - SIRIUS_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + SIRIUS_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage8/$(basename ${SCRIPT_NAME})" fi ;; @@ -243,8 +243,8 @@ case "$with_sirius" in esac if [ "$with_sirius" != "__DONTUSE__" ]; then SIRIUS_LIBS="-lsirius IF_CUDA(-lcusolver|)" - SIRIUS_CUDA_LDFLAGS="-L'${pkg_install_dir}/lib/cuda' -Wl,-rpath='${pkg_install_dir}/lib/cuda'" - SIRIUS_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" + SIRIUS_CUDA_LDFLAGS="-L'${pkg_install_dir}/lib/cuda' -Wl,-rpath,'${pkg_install_dir}/lib/cuda'" + SIRIUS_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" SIRIUS_CFLAGS="-I'${pkg_install_dir}/include'" if [ "$with_sirius" != "__SYSTEM__" ]; then cat << EOF > "${BUILDDIR}/setup_sirius" @@ -261,8 +261,8 @@ EOF cat << EOF >> "${BUILDDIR}/setup_sirius" export SIRIUS_CFLAGS="IF_CUDA(-I${pkg_install_dir}/include/cuda|-I${pkg_install_dir}/include)" export SIRIUS_FFLAGS="IF_CUDA(-I${pkg_install_dir}/include/cuda|-I${pkg_install_dir}/include)" -export SIRIUS_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" -export SIRIUS_CUDA_LDFLAGS="-L'${pkg_install_dir}/lib/cuda' -Wl,-rpath='${pkg_install_dir}/lib/cuda'" +export SIRIUS_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" +export SIRIUS_CUDA_LDFLAGS="-L'${pkg_install_dir}/lib/cuda' -Wl,-rpath,'${pkg_install_dir}/lib/cuda'" export SIRIUS_LIBS="${SIRIUS_LIBS}" export CP_DFLAGS="\${CP_DFLAGS} IF_MPI("-D__SIRIUS"|)" export CP_CFLAGS="\${CP_CFLAGS} IF_MPI("\${SIRIUS_CFLAGS}"|)" diff --git a/tools/toolchain/scripts/stage8/install_spfft.sh b/tools/toolchain/scripts/stage8/install_spfft.sh index 7fd6d4f7d6..9e89581f63 100755 --- a/tools/toolchain/scripts/stage8/install_spfft.sh +++ b/tools/toolchain/scripts/stage8/install_spfft.sh @@ -141,8 +141,8 @@ case "${with_spfft}" in fi SPFFT_ROOT="${pkg_install_dir}" SPFFT_CFLAGS="-I'${pkg_install_dir}/include'" - SPFFT_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" - SPFFT_CUDA_LDFLAGS="-L'${pkg_install_dir}/lib/cuda' -Wl,-rpath='${pkg_install_dir}/lib/cuda'" + SPFFT_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" + SPFFT_CUDA_LDFLAGS="-L'${pkg_install_dir}/lib/cuda' -Wl,-rpath,'${pkg_install_dir}/lib/cuda'" ;; __SYSTEM__) echo "==================== Finding spfft from system paths ====================" @@ -164,7 +164,7 @@ case "${with_spfft}" in check_dir "${SPFFT_LIBDIR}" check_dir "${pkg_install_dir}/include" SPFFT_CFLAGS="-I'${pkg_install_dir}/include'" - SPFFT_LDFLAGS="-L'${SPFFT_LIBDIR}' -Wl,-rpath='${SPFFT_LIBDIR}'" + SPFFT_LDFLAGS="-L'${SPFFT_LIBDIR}' -Wl,-rpath,'${SPFFT_LIBDIR}'" ;; esac if [ "$with_spfft" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/stage8/install_spla.sh b/tools/toolchain/scripts/stage8/install_spla.sh index 1593bf6852..f22422b408 100755 --- a/tools/toolchain/scripts/stage8/install_spla.sh +++ b/tools/toolchain/scripts/stage8/install_spla.sh @@ -139,9 +139,9 @@ case "${with_spla}" in fi SPLA_ROOT="${pkg_install_dir}" SPLA_CFLAGS="-I'${pkg_install_dir}/include/spla'" - SPLA_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath='${pkg_install_dir}/lib'" - SPLA_CUDA_LDFLAGS="-L'${pkg_install_dir}/lib/cuda' -Wl,-rpath='${pkg_install_dir}/lib/cuda'" - SPLA_HIP_LDFLAGS="-L'${pkg_install_dir}/lib/hip' -Wl,-rpath='${pkg_install_dir}/lib/hip'" + SPLA_LDFLAGS="-L'${pkg_install_dir}/lib' -Wl,-rpath,'${pkg_install_dir}/lib'" + SPLA_CUDA_LDFLAGS="-L'${pkg_install_dir}/lib/cuda' -Wl,-rpath,'${pkg_install_dir}/lib/cuda'" + SPLA_HIP_LDFLAGS="-L'${pkg_install_dir}/lib/hip' -Wl,-rpath,'${pkg_install_dir}/lib/hip'" ;; __SYSTEM__) echo "==================== Finding spla from system paths ====================" @@ -163,7 +163,7 @@ case "${with_spla}" in check_dir "${SPLA_LIBDIR}" check_dir "${pkg_install_dir}/include/spla" SPLA_CFLAGS="-I'${pkg_install_dir}/include/spla'" - SPLA_LDFLAGS="-L'${SPLA_LIBDIR}' -Wl,-rpath='${SPLA_LIBDIR}'" + SPLA_LDFLAGS="-L'${SPLA_LIBDIR}' -Wl,-rpath,'${SPLA_LIBDIR}'" ;; esac if [ "$with_spla" != "__DONTUSE__" ]; then diff --git a/tools/toolchain/scripts/tool_kit.sh b/tools/toolchain/scripts/tool_kit.sh index 31e5c57f9d..6921fe1122 100644 --- a/tools/toolchain/scripts/tool_kit.sh +++ b/tools/toolchain/scripts/tool_kit.sh @@ -144,6 +144,8 @@ get_nprocs() { echo ${NPROCS_OVERWRITE} | sed 's/^0*//' elif $(command -v nproc > /dev/null 2>&1); then echo $(nproc --all) + elif $(command -v sysctl > /dev/null 2>&1); then + echo $(sysctl -n hw.ncpu) else echo 1 fi @@ -298,7 +300,7 @@ add_lib_from_paths() { fi echo "Found lib directory $__found_target" eval __ldflags=\$"${__ldflags_name}" - __ldflags="${__ldflags} -L'${__found_target}' -Wl,-rpath='${__found_target}'" + __ldflags="${__ldflags} -L'${__found_target}' -Wl,-rpath,'${__found_target}'" # remove possible duplicates __ldflags="$(unique $__ldflags)" # must escape all quotes again before the last eval, as