Skip to content

Toolchain: Remove redundant exporting variables #7230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Growl1234 wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Toolchain: Remove redundant exporting variables #7230

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
415a49f
Remove redundant exporting variables
Growl1234 Apr 10, 2026
e076667
Make pretty
Growl1234 Apr 10, 2026
3a476b9
Compatibility with CMake 4.x
Growl1234 Apr 10, 2026
ca4944f
Fix
Growl1234 Apr 10, 2026
bf35a25
Make remove_path more robust
Growl1234 Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions toolchain/scripts/package_versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ libxc_alt_ver="6.2.2"
libxc_alt_sha256="f72ed08af7b9dff5f57482c5f97bff22c7dc49da9564bc93871997cbda6dacf3"

# ScaLAPACK (supports dual versions) - main=2.2.2, alt=2.2.1
scalapack_main_ver="2.2.2"
scalapack_main_sha256="a2f0c9180a210bf7ffe126c9cb81099cf337da1a7120ddb4cbe4894eb7b7d022"
scalapack_alt_ver="2.2.1"
scalapack_alt_sha256="4aede775fdb28fa44b331875730bcd5bab130caaec225fadeccf424c8fcb55aa"
scalapack_main_ver="2.2.3"
scalapack_main_sha256="5d93701eca663925e98010dd8d0f45fd79b2191d74e5afa5711d587370a8b9dd"
scalapack_alt_ver="2.2.2"
scalapack_alt_sha256="a2f0c9180a210bf7ffe126c9cb81099cf337da1a7120ddb4cbe4894eb7b7d022"

# =============================================================================
# STAGE 4: Advanced Feature Libraries
Expand Down
9 changes: 0 additions & 9 deletions toolchain/scripts/stage0/install_amd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,6 @@ export FC="${FC}"
export F90="${F90}"
export F77="${F77}"
EOF
if [ "${with_amd}" != "__SYSTEM__" ]; then
cat << EOF >> "${BUILDDIR}/setup_amd"
prepend_path PATH "${pkg_install_dir}/bin"
prepend_path LD_LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path LD_RUN_PATH "${pkg_install_dir}/lib"
prepend_path LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path CPATH "${pkg_install_dir}/include"
EOF
fi
cat << EOF >> "${BUILDDIR}/setup_amd"
export AMD_CFLAGS="${AMD_CFLAGS}"
export AMD_LDFLAGS="${AMD_LDFLAGS}"
Expand Down
3 changes: 1 addition & 2 deletions toolchain/scripts/stage0/install_cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ case "${with_cmake}" in
fi
pkg_install_dir="${INSTALLDIR}/cmake-${cmake_ver}"
#pkg_install_dir="${HOME}/apps/cmake/${cmake_ver}"
install_lock_file="$pkg_install_dir/install_successful"
install_lock_file="${pkg_install_dir}/install_successful"
cmake_pkg="cmake-${cmake_ver}-${cmake_arch}.${cmake_ext}"
if verify_checksums "${install_lock_file}"; then
echo "cmake-${cmake_ver} is already installed, skipping it."
Expand Down Expand Up @@ -138,7 +138,6 @@ if [ "${with_cmake}" != "__DONTUSE__" ]; then
if [ "${with_cmake}" != "__SYSTEM__" ]; then
cat << EOF > "${BUILDDIR}/setup_cmake"
prepend_path PATH "${pkg_install_dir}/bin"
export PATH="${pkg_install_dir}/bin":\${PATH}
EOF
cat "${BUILDDIR}/setup_cmake" >> $SETUPFILE
fi
Expand Down
9 changes: 1 addition & 8 deletions toolchain/scripts/stage0/install_gcc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ case "${with_gcc}" in
repack_filename="gcc-${gcc_ver}-with-prereq.tar.gz"
repkg_install_dir="${INSTALLDIR}/${repack_filename}"
#pkg_install_dir="${HOME}/apps/gcc/${gcc_ver}"
install_lock_file="$pkg_install_dir/install_successful"
install_lock_file="${pkg_install_dir}/install_successful"
if verify_checksums "${install_lock_file}"; then
echo "gcc-${gcc_ver} is already installed, skipping it."
else
Expand Down Expand Up @@ -229,13 +229,6 @@ prepend_path LD_RUN_PATH "${pkg_install_dir}/lib64"
prepend_path LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path LIBRARY_PATH "${pkg_install_dir}/lib64"
prepend_path CPATH "${pkg_install_dir}/include"
export LD_LIBRARY_PATH="${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH="${pkg_install_dir}/lib64":\${LD_LIBRARY_PATH}
export LD_RUN_PATH="${pkg_install_dir}/lib":\${LD_RUN_PATH}
export LD_RUN_PATH="${pkg_install_dir}/lib64":\${LD_RUN_PATH}
export LIBRARY_PATH="${pkg_install_dir}/lib":\${LIBRARY_PATH}
export LIBRARY_PATH="${pkg_install_dir}/lib64":\${LIBRARY_PATH}
export CPATH="${pkg_install_dir}/include":\${CPATH}
EOF
fi
cat << EOF >> "${BUILDDIR}/setup_gcc"
Expand Down
9 changes: 0 additions & 9 deletions toolchain/scripts/stage0/install_intel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,6 @@ export FC="${FC}"
export F90="${F90}"
export F77="${F77}"
EOF
if [ "${with_intel}" != "__SYSTEM__" ]; then
cat << EOF >> "${BUILDDIR}/setup_intel"
prepend_path PATH "${pkg_install_dir}/bin"
prepend_path LD_LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path LD_RUN_PATH "${pkg_install_dir}/lib"
prepend_path LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path CPATH "${pkg_install_dir}/include"
EOF
fi
cat << EOF >> "${BUILDDIR}/setup_intel"
export INTEL_CFLAGS="${INTEL_CFLAGS}"
export INTEL_LDFLAGS="${INTEL_LDFLAGS}"
Expand Down
10 changes: 0 additions & 10 deletions toolchain/scripts/stage1/install_intelmpi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,6 @@ export CP_CFLAGS="\${CP_CFLAGS} IF_MPI(${INTELMPI_CFLAGS}|)"
export CP_LDFLAGS="\${CP_LDFLAGS} IF_MPI(${INTELMPI_LDFLAGS}|)"
export CP_LIBS="\${CP_LIBS} IF_MPI(${INTELMPI_LIBS}|)"
EOF
if [ "${with_intelmpi}" != "__SYSTEM__" ]; then
cat << EOF >> "${BUILDDIR}/setup_intelmpi"
prepend_path PATH "${pkg_install_dir}/bin"
export PATH="${pkg_install_dir}/bin":\${PATH}
export LD_LIBRARY_PATH="${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
export LD_RUN_PATH="${pkg_install_dir}/lib":\${LD_RUN_PATH}
export LIBRARY_PATH="${pkg_install_dir}/lib":\${LIBRARY_PATH}
export CPATH="${pkg_install_dir}/include":\${CPATH}
EOF
fi
cat "${BUILDDIR}/setup_intelmpi" >> ${SETUPFILE}
fi

Expand Down
11 changes: 5 additions & 6 deletions toolchain/scripts/stage1/install_mpich.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ case "${with_mpich}" in
echo "==================== Installing MPICH ===================="
pkg_install_dir="${INSTALLDIR}/mpich-${mpich_ver}"
#pkg_install_dir="${HOME}/apps/mpich/${mpich_ver}-intel"
install_lock_file="$pkg_install_dir/install_successful"
install_lock_file="${pkg_install_dir}/install_successful"
url="https://www.mpich.org/static/downloads/${mpich_ver}/${mpich_pkg}"
if verify_checksums "${install_lock_file}"; then
echo "mpich-${mpich_ver} is already installed, skipping it."
Expand Down Expand Up @@ -176,11 +176,10 @@ EOF
if [ "${with_mpich}" != "__SYSTEM__" ]; then
cat << EOF >> "${BUILDDIR}/setup_mpich"
prepend_path PATH "${pkg_install_dir}/bin"
export PATH="${pkg_install_dir}/bin":\${PATH}
export LD_LIBRARY_PATH="${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
export LD_RUN_PATH="${pkg_install_dir}/lib":\${LD_RUN_PATH}
export LIBRARY_PATH="${pkg_install_dir}/lib":\${LIBRARY_PATH}
export CPATH="${pkg_install_dir}/include":\${CPATH}
prepend_path LD_LIBRARY_PATH="${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
prepend_path LD_RUN_PATH="${pkg_install_dir}/lib":\${LD_RUN_PATH}
prepend_path LIBRARY_PATH="${pkg_install_dir}/lib":\${LIBRARY_PATH}
prepend_path CPATH="${pkg_install_dir}/include":\${CPATH}
EOF
fi
cat "${BUILDDIR}/setup_mpich" >> ${SETUPFILE}
Expand Down
12 changes: 5 additions & 7 deletions toolchain/scripts/stage1/install_openmpi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ case "${with_openmpi}" in
__INSTALL__)
echo "==================== Installing OpenMPI ===================="
pkg_install_dir="${INSTALLDIR}/openmpi-${openmpi_ver}"
install_lock_file="$pkg_install_dir/install_successful"
install_lock_file="${pkg_install_dir}/install_successful"
url="https://download.open-mpi.org/release/open-mpi/v${openmpi_ver%.*}/${openmpi_pkg}"
if verify_checksums "${install_lock_file}"; then
echo "openmpi-${openmpi_ver} is already installed, skipping it."
Expand Down Expand Up @@ -205,12 +205,10 @@ EOF
if [ "${with_openmpi}" != "__SYSTEM__" ]; then
cat << EOF >> "${BUILDDIR}/setup_openmpi"
prepend_path PATH "${pkg_install_dir}/bin"
export PATH="${pkg_install_dir}/bin":\${PATH}
export LD_LIBRARY_PATH="${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
export LD_RUN_PATH="${pkg_install_dir}/lib":\${LD_RUN_PATH}
export LIBRARY_PATH="${pkg_install_dir}/lib":\${LIBRARY_PATH}
export CPATH="${pkg_install_dir}/include":\${CPATH}

prepend_path LD_LIBRARY_PATH="${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
prepend_path LD_RUN_PATH="${pkg_install_dir}/lib":\${LD_RUN_PATH}
prepend_path LIBRARY_PATH="${pkg_install_dir}/lib":\${LIBRARY_PATH}
prepend_path CPATH="${pkg_install_dir}/include":\${CPATH}
EOF
fi
cat "${BUILDDIR}/setup_openmpi" >> ${SETUPFILE}
Expand Down
18 changes: 0 additions & 18 deletions toolchain/scripts/stage2/install_aocl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,6 @@ case "${with_aocl}" in
;;
esac
if [ "$with_aocl" != "__DONTUSE__" ]; then
if [ "$with_aocl" != "__SYSTEM__" ]; then
cat << EOF > "${BUILDDIR}/setup_aocl"
prepend_path LD_LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path LD_RUN_PATH "$pkg_install_dir/lib"
prepend_path LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path PKG_CONFIG_PATH "$pkg_install_dir/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "$pkg_install_dir"
prepend_path CPATH "$pkg_install_dir/include"
export LD_LIBRARY_PATH="$pkg_install_dir/lib:"\${LD_LIBRARY_PATH}
export LD_RUN_PATH="$pkg_install_dir/lib:"\${LD_RUN_PATH}
export LIBRARY_PATH="$pkg_install_dir/lib:"\${LIBRARY_PATH}
export CPATH="$pkg_install_dir/include:"\${CPATH}
export PKG_CONFIG_PATH="$pkg_install_dir/lib/pkgconfig:"\${PKG_CONFIG_PATH}
export CMAKE_PREFIX_PATH="$pkg_install_dir:"\${CMAKE_PREFIX_PATH}
export AOCL_ROOT=${pkg_install_dir}
EOF
cat "${BUILDDIR}/setup_aocl" >> $SETUPFILE
fi
cat << EOF >> "${BUILDDIR}/setup_aocl"
export AOCL_ROOT="${pkg_install_dir}"
export AOCL_CFLAGS="${AOCL_CFLAGS}"
Expand Down
25 changes: 9 additions & 16 deletions toolchain/scripts/stage2/install_openblas.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ case "${with_openblas}" in
__INSTALL__)
echo "==================== Installing OpenBLAS ===================="
pkg_install_dir="${INSTALLDIR}/openblas-${openblas_ver}"
install_lock_file="$pkg_install_dir/install_successful"
install_lock_file="${pkg_install_dir}/install_successful"
if verify_checksums "${install_lock_file}"; then
echo "openblas-${openblas_ver} is already installed, skipping it."
else
Expand Down Expand Up @@ -172,19 +172,12 @@ esac
if [ "$with_openblas" != "__DONTUSE__" ]; then
if [ "$with_openblas" != "__SYSTEM__" ]; then
cat << EOF > "${BUILDDIR}/setup_openblas"
prepend_path LD_LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path LD_RUN_PATH "$pkg_install_dir/lib"
prepend_path LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path PKG_CONFIG_PATH "$pkg_install_dir/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "$pkg_install_dir"
prepend_path CPATH "$pkg_install_dir/include"
export LD_LIBRARY_PATH="$pkg_install_dir/lib:"\${LD_LIBRARY_PATH}
export LD_RUN_PATH="$pkg_install_dir/lib:"\${LD_RUN_PATH}
export LIBRARY_PATH="$pkg_install_dir/lib:"\${LIBRARY_PATH}
export CPATH="$pkg_install_dir/include:"\${CPATH}
export PKG_CONFIG_PATH="$pkg_install_dir/lib/pkgconfig:"\${PKG_CONFIG_PATH}
export CMAKE_PREFIX_PATH="$pkg_install_dir:"\${CMAKE_PREFIX_PATH}
export OPENBLAS_ROOT=${pkg_install_dir}
prepend_path LD_LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path LD_RUN_PATH "${pkg_install_dir}/lib"
prepend_path LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path PKG_CONFIG_PATH "${pkg_install_dir}/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
prepend_path CPATH "${pkg_install_dir}/include"
EOF
cat "${BUILDDIR}/setup_openblas" >> $SETUPFILE
fi
Expand All @@ -198,8 +191,8 @@ export MATH_LDFLAGS="\${MATH_LDFLAGS} ${OPENBLAS_LDFLAGS}"
export MATH_LIBS="\${MATH_LIBS} ${OPENBLAS_LIBS}"
export PKG_CONFIG_PATH="${pkg_install_dir}/lib/pkgconfig"
export CMAKE_PREFIX_PATH="${pkg_install_dir}"
prepend_path PKG_CONFIG_PATH "$pkg_install_dir/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "$pkg_install_dir"
prepend_path PKG_CONFIG_PATH "${pkg_install_dir}/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
EOF
fi

Expand Down
26 changes: 9 additions & 17 deletions toolchain/scripts/stage3/install_elpa.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ case "$with_elpa" in
echo "==================== Installing ELPA ===================="
pkg_install_dir="${INSTALLDIR}/elpa-${elpa_ver}"
#pkg_install_dir="${HOME}/lib/elpa/${elpa_ver}-gcc8"
install_lock_file="$pkg_install_dir/install_successful"
install_lock_file="${pkg_install_dir}/install_successful"
enable_openmp="yes"

# specific settings needed on CRAY Linux Environment
Expand Down Expand Up @@ -250,33 +250,25 @@ prepend_path CPATH "$elpa_include"
EOF
if [ "$with_elpa" != "__SYSTEM__" ]; then
cat << EOF >> "${BUILDDIR}/setup_elpa"
prepend_path PATH "$pkg_install_dir/bin"
prepend_path LD_LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path CPATH "$pkg_install_dir/include"
prepend_path LD_RUN_PATH "$pkg_install_dir/lib"
prepend_path LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path PKG_CONFIG_PATH "$pkg_install_dir/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "$pkg_install_dir"
export PATH="$pkg_install_dir/bin":\${PATH}
export LD_LIBRARY_PATH="$pkg_install_dir/lib":\${LD_LIBRARY_PATH}
export LD_RUN_PATH="$pkg_install_dir/lib":\${LD_RUN_PATH}
export LIBRARY_PATH="$pkg_install_dir/lib":\${LIBRARY_PATH}
export CPATH="$pkg_install_dir/include":\${CPATH}
export PKG_CONFIG_PATH="$pkg_install_dir/lib/pkgconfig":\${PKG_CONFIG_PATH}
export CMAKE_PREFIX_PATH="$pkg_install_dir":\${CMAKE_PREFIX_PATH}
export ELPA_ROOT="$pkg_install_dir"
prepend_path PATH "${pkg_install_dir}/bin"
prepend_path LD_LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path CPATH "${pkg_install_dir}/include"
prepend_path LD_RUN_PATH "${pkg_install_dir}/lib"
prepend_path LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path PKG_CONFIG_PATH "${pkg_install_dir}/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
EOF
cat "${BUILDDIR}/setup_elpa" >> $SETUPFILE
fi
cat << EOF >> "${BUILDDIR}/setup_elpa"
export ELPA_ROOT="${pkg_install_dir}"
export ELPA_CFLAGS="${ELPA_CFLAGS}"
export ELPA_LDFLAGS="${ELPA_LDFLAGS}"
export ELPA_LIBS="${ELPA_LIBS}"
export CP_DFLAGS="\${CP_DFLAGS} IF_MPI(-D__ELPA IF_CUDA(-D__ELPA_NVIDIA_GPU|)|)"
export CP_CFLAGS="\${CP_CFLAGS} IF_MPI(${ELPA_CFLAGS}|)"
export CP_LDFLAGS="\${CP_LDFLAGS} IF_MPI(${ELPA_LDFLAGS}|)"
export CP_LIBS="IF_MPI(${ELPA_LIBS}|) \${CP_LIBS}"
export ELPA_ROOT="$pkg_install_dir"
export ELPA_VERSION="${elpa_ver}"
EOF

Expand Down
20 changes: 7 additions & 13 deletions toolchain/scripts/stage3/install_fftw.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ case "$with_fftw" in
require_env MPI_LIBS
echo "==================== Installing FFTW ===================="
pkg_install_dir="${INSTALLDIR}/fftw-${fftw_ver}"
install_lock_file="$pkg_install_dir/install_successful"
install_lock_file="${pkg_install_dir}/install_successful"
if verify_checksums "${install_lock_file}"; then
echo "fftw-${fftw_ver} is already installed, skipping it."
else
Expand Down Expand Up @@ -128,18 +128,12 @@ if [ "$with_fftw" != "__DONTUSE__" ]; then
FFTW_LIBS+="-lfftw3 -lfftw3_omp"
if [ "$with_fftw" != "__SYSTEM__" ]; then
cat << EOF > "${BUILDDIR}/setup_fftw"
prepend_path LD_LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path LD_RUN_PATH "$pkg_install_dir/lib"
prepend_path LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path CPATH "$pkg_install_dir/include"
prepend_path PKG_CONFIG_PATH "$pkg_install_dir/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "$pkg_install_dir"
export LD_LIBRARY_PATH="$pkg_install_dir/lib":\${LD_LIBRARY_PATH}
export LD_RUN_PATH="$pkg_install_dir/lib":\${LD_RUN_PATH}
export LIBRARY_PATH="$pkg_install_dir/lib":\${LIBRARY_PATH}
export CPATH="$pkg_install_dir/include":\${CPATH}
export PKG_CONFIG_PATH="$pkg_install_dir/lib/pkgconfig":\${PKG_CONFIG_PATH}
export CMAKE_PREFIX_PATH="$pkg_install_dir":\${CMAKE_PREFIX_PATH}
prepend_path LD_LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path LD_RUN_PATH "${pkg_install_dir}/lib"
prepend_path LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path CPATH "${pkg_install_dir}/include"
prepend_path PKG_CONFIG_PATH "${pkg_install_dir}/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
EOF
fi
# we may also want to cover FFT_SG
Expand Down
23 changes: 9 additions & 14 deletions toolchain/scripts/stage3/install_libxc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ case "$with_libxc" in
echo "==================== Installing LIBXC ===================="
pkg_install_dir="${INSTALLDIR}/libxc-${libxc_ver}"
#pkg_install_dir="${HOME}/lib/libxc/${libxc_ver}-gcc8"
install_lock_file="$pkg_install_dir/install_successful"
install_lock_file="${pkg_install_dir}/install_successful"
if verify_checksums "${install_lock_file}"; then
echo "libxc-${libxc_ver} is already installed, skipping it."
else
Expand Down Expand Up @@ -77,6 +77,7 @@ case "$with_libxc" in
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DENABLE_FORTRAN=ON \
-DENABLE_PYTHON=OFF \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DBUILD_TESTING=OFF .. \
> configure.log 2>&1 || tail -n ${LOG_LINES} configure.log
make -j $(get_nprocs) > make.log 2>&1 || tail -n ${LOG_LINES} make.log
Expand Down Expand Up @@ -113,18 +114,12 @@ if [ "$with_libxc" != "__DONTUSE__" ]; then
LIBXC_LIBS="-lxcf03 -lxc"
if [ "$with_libxc" != "__SYSTEM__" ]; then
cat << EOF > "${BUILDDIR}/setup_libxc"
prepend_path LD_LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path LD_RUN_PATH "$pkg_install_dir/lib"
prepend_path LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path CPATH "$pkg_install_dir/include"
prepend_path PKG_CONFIG_PATH "$pkg_install_dir/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "$pkg_install_dir"
export LD_LIBRARY_PATH="$pkg_install_dir/lib":\${LD_LIBRARY_PATH}
export LD_RUN_PATH="$pkg_install_dir/lib":\${LD_RUN_PATH}
export LIBRARY_PATH="$pkg_install_dir/lib":\${LIBRARY_PATH}
export CPATH="$pkg_install_dir/include":\${CPATH}
export PKG_CONFIG_PATH="$pkg_install_dir/lib/pkgconfig":\${PKG_CONFIG_PATH}
export CMAKE_PREFIX_PATH="$pkg_install_dir":\${CMAKE_PREFIX_PATH}
prepend_path LD_LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path LD_RUN_PATH "${pkg_install_dir}/lib"
prepend_path LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path CPATH "${pkg_install_dir}/include"
prepend_path PKG_CONFIG_PATH "${pkg_install_dir}/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
EOF
cat "${BUILDDIR}/setup_libxc" >> $SETUPFILE
fi
Expand All @@ -136,7 +131,7 @@ export CP_DFLAGS="\${CP_DFLAGS} -D__LIBXC"
export CP_CFLAGS="\${CP_CFLAGS} ${LIBXC_CFLAGS}"
export CP_LDFLAGS="\${CP_LDFLAGS} ${LIBXC_LDFLAGS}"
export CP_LIBS="${LIBXC_LIBS} \${CP_LIBS}"
export LIBXC_ROOT="$pkg_install_dir"
export LIBXC_ROOT="${pkg_install_dir}"
EOF
fi

Expand Down
9 changes: 2 additions & 7 deletions toolchain/scripts/stage3/install_scalapack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ case "${with_scalapack}" in
__INSTALL__)
echo "==================== Installing ScaLAPACK ===================="
pkg_install_dir="${INSTALLDIR}/scalapack-${scalapack_ver}"
install_lock_file="$pkg_install_dir/install_successful"
install_lock_file="${pkg_install_dir}/install_successful"
if verify_checksums "${install_lock_file}"; then
echo "scalapack-${scalapack_ver} is already installed, skipping it."
else
Expand Down Expand Up @@ -119,16 +119,11 @@ prepend_path LD_RUN_PATH "${pkg_install_dir}/lib"
prepend_path LIBRARY_PATH "${pkg_install_dir}/lib"
prepend_path PKG_CONFIG_PATH "${pkg_install_dir}/lib/pkgconfig"
prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
export LD_LIBRARY_PATH="${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
export LD_RUN_PATH="${pkg_install_dir}/lib":\${LD_RUN_PATH}
export LIBRARY_PATH="${pkg_install_dir}/lib":\${LIBRARY_PATH}
export PKG_CONFIG_PATH="${pkg_install_dir}/lib/pkgconfig":\${PKG_CONFIG_PATH}
export CMAKE_PREFIX_PATH="${pkg_install_dir}":\${CMAKE_PREFIX_PATH}
export SCALAPACK_ROOT="${pkg_install_dir}"
EOF
cat "${BUILDDIR}/setup_scalapack" >> $SETUPFILE
fi
cat << EOF >> "${BUILDDIR}/setup_scalapack"
export SCALAPACK_ROOT="${pkg_install_dir}"
export SCALAPACK_LDFLAGS="${SCALAPACK_LDFLAGS}"
export SCALAPACK_LIBS="${SCALAPACK_LIBS}"
export SCALAPACK_ROOT="${pkg_install_dir}"
Expand Down
Loading
Loading