Relocate lines for package version dump

hfp · Sep 6, 2024 · 17fb60b · 17fb60b
1 parent 3713491
commit 17fb60b
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 22 deletions.
diff --git a/tools/toolchain/scripts/stage3/install_libgrpp.sh b/tools/toolchain/scripts/stage3/install_libgrpp.sh
@@ -79,8 +79,11 @@ case "${with_libgrpp}" in
 esac
 if [ "$with_libgrpp" != "__DONTUSE__" ]; then
   LIBGRPP_LIBS="-llibgrpp"
+  cat << EOF > "${BUILDDIR}/setup_libgrpp"
+export LIBGRPP_VER="${libgrpp_ver}"
+EOF
   if [ "$with_libgrpp" != "__SYSTEM__" ]; then
-    cat << EOF > "${BUILDDIR}/setup_libgrpp"
+    cat << EOF >> "${BUILDDIR}/setup_libgrpp"
 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"
@@ -91,7 +94,6 @@ EOF
     cat "${BUILDDIR}/setup_libgrpp" >> $SETUPFILE
   fi
   cat << EOF >> "${BUILDDIR}/setup_libgrpp"
-export LIBGRPP_VER="${libgrpp_ver}"
 export LIBGRPP_CFLAGS="${LIBGRPP_CFLAGS}"
 export LIBGRPP_LDFLAGS="${LIBGRPP_LDFLAGS}"
 export LIBGRPP_LIBS="${LIBGRPP_LIBS}"

diff --git a/tools/toolchain/scripts/stage3/install_libint.sh b/tools/toolchain/scripts/stage3/install_libint.sh
@@ -116,8 +116,11 @@ case "$with_libint" in
 esac
 if [ "$with_libint" != "__DONTUSE__" ]; then
   LIBINT_LIBS="-lint2"
+  cat << EOF > "${BUILDDIR}/setup_libint"
+export LIBINT_VER="${libint_ver}"
+EOF
   if [ "$with_libint" != "__SYSTEM__" ]; then
-    cat << EOF > "${BUILDDIR}/setup_libint"
+    cat << EOF >> "${BUILDDIR}/setup_libint"
 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"
@@ -128,7 +131,6 @@ EOF
     cat "${BUILDDIR}/setup_libint" >> $SETUPFILE
   fi
   cat << EOF >> "${BUILDDIR}/setup_libint"
-export LIBINT_VER="${libint_ver}"
 export LIBINT_CFLAGS="${LIBINT_CFLAGS}"
 export LIBINT_LDFLAGS="${LIBINT_LDFLAGS}"
 export LIBINT_LIBS="${LIBINT_LIBS}"

diff --git a/tools/toolchain/scripts/stage3/install_libxc.sh b/tools/toolchain/scripts/stage3/install_libxc.sh
@@ -71,8 +71,11 @@ case "$with_libxc" in
 esac
 if [ "$with_libxc" != "__DONTUSE__" ]; then
   LIBXC_LIBS="-lxcf03 -lxc"
+  cat << EOF > "${BUILDDIR}/setup_libxc"
+export LIBXC_VER="${libxc_ver}"
+EOF
   if [ "$with_libxc" != "__SYSTEM__" ]; then
-    cat << EOF > "${BUILDDIR}/setup_libxc"
+    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"
@@ -83,7 +86,6 @@ EOF
     cat "${BUILDDIR}/setup_libxc" >> $SETUPFILE
   fi
   cat << EOF >> "${BUILDDIR}/setup_libxc"
-export LIBXC_VER="${libxc_ver}"
 export LIBXC_CFLAGS="${LIBXC_CFLAGS}"
 export LIBXC_LDFLAGS="${LIBXC_LDFLAGS}"
 export LIBXC_LIBS="${LIBXC_LIBS}"

diff --git a/tools/toolchain/scripts/stage4/install_libxsmm.sh b/tools/toolchain/scripts/stage4/install_libxsmm.sh
@@ -103,8 +103,11 @@ EOF
 esac
 if [ "$with_libxsmm" != "__DONTUSE__" ]; then
   LIBXSMM_LIBS="-lxsmmf -lxsmmext -lxsmm -ldl -lpthread"
+  cat << EOF > "${BUILDDIR}/setup_libxsmm"
+export LIBXSMM_VER="${libxsmm_ver}"
+EOF
   if [ "$with_libxsmm" != "__SYSTEM__" ]; then
-    cat << EOF > "${BUILDDIR}/setup_libxsmm"
+    cat << EOF >> "${BUILDDIR}/setup_libxsmm"
 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"
@@ -114,7 +117,6 @@ EOF
     cat "${BUILDDIR}/setup_libxsmm" >> $SETUPFILE
   fi
   cat << EOF >> "${BUILDDIR}/setup_libxsmm"
-export LIBXSMM_VER="${libxsmm_ver}"
 export LIBXSMM_CFLAGS="${LIBXSMM_CFLAGS}"
 export LIBXSMM_LDFLAGS="${LIBXSMM_LDFLAGS}"
 export LIBXSMM_LIBS="${LIBXSMM_LIBS}"

diff --git a/tools/toolchain/scripts/stage4/install_scalapack.sh b/tools/toolchain/scripts/stage4/install_scalapack.sh
@@ -84,8 +84,11 @@ case "$with_scalapack" in
 esac
 if [ "$with_scalapack" != "__DONTUSE__" ]; then
   SCALAPACK_LIBS="-lscalapack"
+  cat << EOF > "${BUILDDIR}/setup_scalapack"
+export SCALAPACK_VER="${scalapack_ver}"
+EOF
   if [ "$with_scalapack" != "__SYSTEM__" ]; then
-    cat << EOF > "${BUILDDIR}/setup_scalapack"
+    cat << EOF >> "${BUILDDIR}/setup_scalapack"
 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"
@@ -96,7 +99,6 @@ EOF
     cat "${BUILDDIR}/setup_scalapack" >> $SETUPFILE
   fi
   cat << EOF >> "${BUILDDIR}/setup_scalapack"
-export SCALAPACK_VER="${scalapack_ver}"
 export SCALAPACK_LDFLAGS="${SCALAPACK_LDFLAGS}"
 export SCALAPACK_LIBS="${SCALAPACK_LIBS}"
 export SCALAPACK_ROOT="${pkg_install_dir}"

diff --git a/tools/toolchain/scripts/stage5/install_elpa.sh b/tools/toolchain/scripts/stage5/install_elpa.sh
@@ -169,6 +169,7 @@ esac
 if [ "$with_elpa" != "__DONTUSE__" ]; then
   ELPA_LIBS="-lelpa${elpa_dir_openmp}"
   cat << EOF > "${BUILDDIR}/setup_elpa"
+export ELPA_VER="${elpa_ver}"
 prepend_path CPATH "$elpa_include"
 EOF
   if [ "$with_elpa" != "__SYSTEM__" ]; then
@@ -184,7 +185,6 @@ EOF
   fi
   cat "${BUILDDIR}/setup_elpa" >> $SETUPFILE
   cat << EOF >> "${BUILDDIR}/setup_elpa"
-export ELPA_VER="${elpa_ver}"
 export ELPA_CFLAGS="${ELPA_CFLAGS}"
 export ELPA_LDFLAGS="${ELPA_LDFLAGS}"
 export ELPA_LIBS="${ELPA_LIBS}"

diff --git a/tools/toolchain/scripts/stage5/install_pexsi.sh b/tools/toolchain/scripts/stage5/install_pexsi.sh
@@ -111,8 +111,11 @@ case "$with_pexsi" in
 esac
 if [ "$with_pexsi" != "__DONTUSE__" ]; then
   PEXSI_LIBS="-lpexsi"
+  cat << EOF > "${BUILDDIR}/setup_pexsi"
+export PEXSI_VER="${pexsi_ver}"
+EOF
   if [ "$with_pexsi" != "__SYSTEM__" ]; then
-    cat << EOF > "${BUILDDIR}/setup_pexsi"
+    cat << EOF >> "${BUILDDIR}/setup_pexsi"
 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"
@@ -123,7 +126,6 @@ EOF
     cat "${BUILDDIR}/setup_pexsi" >> $SETUPFILE
   fi
   cat << EOF >> "${BUILDDIR}/setup_pexsi"
-export PEXSI_VER="${pexsi_ver}"
 export PEXSI_CFLAGS="${PEXSI_CFLAGS}"
 export PEXSI_LDFLAGS="${PEXSI_LDFLAGS}"
 export PEXSI_LIBS="${PEXSI_LIBS}"

diff --git a/tools/toolchain/scripts/stage5/install_ptscotch.sh b/tools/toolchain/scripts/stage5/install_ptscotch.sh
@@ -87,8 +87,11 @@ case "${with_ptscotch}" in
 esac
 if [ "$with_ptscotch" != "__DONTUSE__" ]; then
   SCOTCH_LIBS="-lptscotchparmetis -lptscotch -lptscotcherr -lscotchmetis -lscotch -lscotcherr"
+  cat << EOF > "${BUILDDIR}/setup_ptscotch"
+export SCOTCH_VER="${scotch_ver}"
+EOF
   if [ "$with_ptscotch" != "__SYSTEM__" ]; then
-    cat << EOF > "${BUILDDIR}/setup_ptscotch"
+    cat << EOF >> "${BUILDDIR}/setup_ptscotch"
 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"
@@ -100,7 +103,6 @@ EOF
     cat "${BUILDDIR}/setup_ptscotch" >> $SETUPFILE
   fi
   cat << EOF >> "${BUILDDIR}/setup_ptscotch"
-export SCOTCH_VER="${scotch_ver}"
 export SCOTCH_CFLAGS="${SCOTCH_CFLAGS}"
 export SCOTCH_LDFLAGS="${SCOTCH_LDFLAGS}"
 export SCOTCH_LIBS="${SCOTCH_LIBS}"

diff --git a/tools/toolchain/scripts/stage5/install_superlu.sh b/tools/toolchain/scripts/stage5/install_superlu.sh
@@ -78,8 +78,11 @@ case "$with_superlu" in
 esac
 if [ "$with_superlu" != "__DONTUSE__" ]; then
   SUPERLU_LIBS="-lsuperlu_dist"
+  cat << EOF > "${BUILDDIR}/setup_superlu"
+export SUPERLU_VER="${superlu_ver}"
+EOF
   if [ "$with_superlu" != "__SYSTEM__" ]; then
-    cat << EOF > "${BUILDDIR}/setup_superlu"
+    cat << EOF >> "${BUILDDIR}/setup_superlu"
 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"
@@ -90,7 +93,6 @@ EOF
     cat "${BUILDDIR}/setup_superlu" >> $SETUPFILE
   fi
   cat << EOF >> "${BUILDDIR}/setup_superlu"
-export SUPERLU_VER="${superlu_ver}"
 export SUPERLU_CFLAGS="${SUPERLU_CFLAGS}"
 export SUPERLU_LDFLAGS="${SUPERLU_LDFLAGS}"
 export SUPERLU_LIBS="${SUPERLU_LIBS}"

diff --git a/tools/toolchain/scripts/stage6/install_deepmd.sh b/tools/toolchain/scripts/stage6/install_deepmd.sh
@@ -70,8 +70,11 @@ esac
 
 if [ "$with_deepmd" != "__DONTUSE__" ]; then
   DEEPMD_LIBS='-ldeepmd_c -lstdc++'
+  cat << EOF > "${BUILDDIR}/setup_deepmd"
+export DEEPMD_VER="${deepmd_ver}"
+EOF
   if [ "$with_deepmd" != "__SYSTEM__" ]; then
-    cat << EOF > "${BUILDDIR}/setup_deepmd"
+    cat << EOF >> "${BUILDDIR}/setup_deepmd"
 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"
@@ -80,7 +83,6 @@ EOF
   fi
 
   cat << EOF >> "${BUILDDIR}/setup_deepmd"
-export DEEPMD_VER="${deepmd_ver}"
 export DEEPMD_DFLAGS="${DEEPMD_DFLAGS}"
 export DEEPMD_CFLAGS="${DEEPMD_CFLAGS}"
 export DEEPMD_LDFLAGS="${DEEPMD_LDFLAGS}"

diff --git a/tools/toolchain/scripts/stage6/install_plumed.sh b/tools/toolchain/scripts/stage6/install_plumed.sh
@@ -97,8 +97,11 @@ if [ "$with_plumed" != "__DONTUSE__" ]; then
   else
     PLUMED_LIBS="-lplumed -ldl -lstdc++ -lz -ldl"
   fi
+  cat << EOF > "${BUILDDIR}/setup_plumed"
+export PLUMED_VER="${plumed_ver}"
+EOF
   if [ "$with_plumed" != "__SYSTEM__" ]; then
-    cat << EOF > "${BUILDDIR}/setup_plumed"
+    cat << EOF >> "${BUILDDIR}/setup_plumed"
 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"
@@ -107,9 +110,7 @@ prepend_path CMAKE_PREFIX_PATH "$pkg_install_dir"
 EOF
     cat "${BUILDDIR}/setup_plumed" >> $SETUPFILE
   fi
-
   cat << EOF >> "${BUILDDIR}/setup_plumed"
-export PLUMED_VER="${plumed_ver}"
 export PLUMED_LDFLAGS="${PLUMED_LDFLAGS}"
 export PLUMED_LIBS="${PLUMED_LIBS}"
 export CP_DFLAGS="\${CP_DFLAGS} IF_MPI(-D__PLUMED2|)"