From 32851d79723e7ab2a96eb5ab7ec8f4956c2bffa3 Mon Sep 17 00:00:00 2001 From: Felix Schlepper Date: Wed, 21 Aug 2024 09:01:27 +0200 Subject: [PATCH] MILLEPEDE: Allow pede to compile on macos (m2) Signed-off-by: Felix Schlepper --- millepede-ii.sh | 14 ++++++++++---- openblas.sh | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/millepede-ii.sh b/millepede-ii.sh index f42bbea71b..698b9bd06a 100644 --- a/millepede-ii.sh +++ b/millepede-ii.sh @@ -4,9 +4,11 @@ tag: "V04-16-00" source: https://gitlab.desy.de/claus.kleinwort/millepede-ii.git requires: - zlib - - openmp + - "openmp:(?!osx.*)" - OpenBLAS - "GCC-Toolchain:(?!osx)" + - "gfortran-system:(osx.*)" + build_requires: - alibuild-recipe-tools --- @@ -16,13 +18,17 @@ rsync -av --delete --exclude="**/.git" ${SOURCEDIR}/ . case $ARCHITECTURE in osx*) - [[ ! $ZLIB_ROOT ]] && ZLIB_ROOT=`brew --prefix zlib` ;; + [[ ! $ZLIB_ROOT ]] && ZLIB_ROOT=$(brew --prefix zlib) + [[ ! $GFORTRAN ]] && GFORTRAN=gfortran + ;; esac make pede\ ${ZLIB_ROOT:+ ZLIB_INCLUDES_DIR=${ZLIB_ROOT}/include ZLIB_LIBS_DIR=${ZLIB_ROOT}/lib}\ - ${OPENBLAS_ROOT:+ SUPPORT_LAPACK64=yes LAPACK64=OPENBLAS LAPACK64_LIBS_DIR=${OPENBLAS_ROOT}/lib LAPACK64_LIB=openblas} - + ${OPENBLAS_ROOT:+ SUPPORT_LAPACK64=yes LAPACK64=OPENBLAS LAPACK64_LIBS_DIR=${OPENBLAS_ROOT}/lib LAPACK64_LIB=openblas}\ + ${GFORTRAN:+ GCC=${GFORTRAN}} + + rsync -a --delete pede ${INSTALLROOT}/bin/ #ModuleFile diff --git a/openblas.sh b/openblas.sh index f1294395d9..e7b0349fe8 100644 --- a/openblas.sh +++ b/openblas.sh @@ -3,7 +3,7 @@ version: "%(tag_basename)s" tag: "v0.3.27" source: https://github.com/xianyi/OpenBLAS.git requires: - - openmp + - "openmp:(?!osx.*)" - "GCC-Toolchain:(?!osx)" build_requires: - CMake