From a6817bd6da7d769ed3cc1d6328937aff6a6f1b7c Mon Sep 17 00:00:00 2001 From: Sergio Garcia Date: Mon, 14 Jul 2025 14:10:49 +0200 Subject: [PATCH 1/2] Fix case where HDF5 comes from the system --- yoda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yoda.sh b/yoda.sh index 3e1046e3f6..ef7c3b86f9 100644 --- a/yoda.sh +++ b/yoda.sh @@ -21,7 +21,7 @@ rsync -a --exclude='**/.git' --delete --delete-excluded "$SOURCEDIR"/ ./ export PYTHON=$(type -p python3) -./configure --disable-silent-rules --enable-root --prefix="$INSTALLROOT" --with-hdf5="$HDF5_ROOT" +./configure --disable-silent-rules --enable-root --prefix="$INSTALLROOT" ${HDF5_ROOT:+--with-hdf5=$HDF5_ROOT} make ${JOBS+-j $JOBS} make install From 1d4cead0bbcb66fdb68b66b8e84b9d8b5a30557f Mon Sep 17 00:00:00 2001 From: Sergio Garcia Date: Mon, 21 Jul 2025 11:55:59 +0200 Subject: [PATCH 2/2] Pickup HDF5 from system in macos too --- yoda.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yoda.sh b/yoda.sh index ef7c3b86f9..f98c232819 100644 --- a/yoda.sh +++ b/yoda.sh @@ -21,6 +21,14 @@ rsync -a --exclude='**/.git' --delete --delete-excluded "$SOURCEDIR"/ ./ export PYTHON=$(type -p python3) +case $ARCHITECTURE in + osx*) + # If we preferred system tools, we need to make sure we can pick them up. + [[ ! $HDF5_ROOT ]] && HDF5_ROOT="$(brew --prefix hdf5)" + ;; + *) ;; +esac + ./configure --disable-silent-rules --enable-root --prefix="$INSTALLROOT" ${HDF5_ROOT:+--with-hdf5=$HDF5_ROOT} make ${JOBS+-j $JOBS} make install