Enable toolchain built with arm64 (aarch64)

cp2k · Mar 31, 2021 · 0dcdad8 · 0dcdad8
1 parent 96730a2
commit 0dcdad8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/tools/toolchain/scripts/stage6/install_quip.sh b/tools/toolchain/scripts/stage6/install_quip.sh
@@ -61,7 +61,7 @@ case "$with_quip" in
         i386)
           quip_arch=x86_32
           ;;
-        arm)
+        arm*)
           quip_arch=x86_64
           ;;
         *)
@@ -103,6 +103,8 @@ case "$with_quip" in
       export QUIP_ARCH=linux_${quip_arch}_gfortran
       # hit enter a few times to accept defaults
       echo -e "${MATH_LDFLAGS} $(resolve_string "${MATH_LIBS}") \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" | make config > configure.log
+      # Download up-to-date config.guess
+      wget http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -O src/fox/config/config.guess -o wget.log
       # make -j does not work :-(
       make > make.log 2>&1
       ! [ -d "${pkg_install_dir}/include" ] && mkdir -p "${pkg_install_dir}/include"

diff --git a/tools/toolchain/scripts/stage7/install_libvori.sh b/tools/toolchain/scripts/stage7/install_libvori.sh
@@ -48,12 +48,25 @@ case "${with_libvori:=__INSTALL__}" in
 
       mkdir "libvori-${libvori_ver}/build"
       cd "libvori-${libvori_ver}/build"
-      cmake \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-        -DCMAKE_INSTALL_PREFIX="${pkg_install_dir}" \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE \
-        .. > cmake.log 2>&1
+      case ${OPENBLAS_ARCH} in
+        arm64)
+          cmake \
+           -DCMAKE_BUILD_TYPE=None \
+           -DCMAKE_CXX_FLAGS="-O1 -g" \
+           -DCMAKE_INSTALL_PREFIX="${pkg_install_dir}" \
+           -DCMAKE_INSTALL_LIBDIR=lib \
+           -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE \
+           .. > cmake.log 2>&1
+        ;;
+        *)
+          cmake \
+           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DCMAKE_INSTALL_PREFIX="${pkg_install_dir}" \
+           -DCMAKE_INSTALL_LIBDIR=lib \
+           -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE \
+           .. > cmake.log 2>&1
+        ;;
+      esac
       CMAKE_BUILD_PARALLEL_LEVEL="$(get_nprocs)" cmake --build . > build.log 2>&1
       CMAKE_BUILD_PARALLEL_LEVEL="$(get_nprocs)" cmake --build . --target test > test.log 2>&1
       CMAKE_BUILD_PARALLEL_LEVEL="$(get_nprocs)" cmake --build . --target install > install.log 2>&1