From 456fcb6bc4b777c48b5092d2d6df36ac83984b74 Mon Sep 17 00:00:00 2001 From: Dave Allured Date: Fri, 22 Sep 2023 23:41:39 -0600 Subject: [PATCH 1/3] hdf5: Fix build with CLT 15.0 . Closes: https://trac.macports.org/ticket/68194 * Remove `-commons` from configure, not supported in Sonoma/CLT 15.0. * `-commons` no longer needed for HDF5 series 10.0 and later. Was fixed upstream: https://github.com/HDFGroup/hdf5/pull/3581 --- science/hdf5/Portfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/science/hdf5/Portfile b/science/hdf5/Portfile index 7fd7fd2923ad9..7646baddf3bf1 100644 --- a/science/hdf5/Portfile +++ b/science/hdf5/Portfile @@ -40,7 +40,8 @@ use_bzip2 yes depends_lib port:zlib port:libaec use_parallel_build yes -patchfiles patch-tools-src-misc-h5cc.in.diff +patchfiles patch-no-commons.diff \ + patch-tools-src-misc-h5cc.in.diff # llvm-gcc-4.2 produced code fails type conversion tests # Upstream suggestion is use -O0. Clang-produced code passes all tests. From 28337b29f738a1c54263ed4161f6e603d4866eb9 Mon Sep 17 00:00:00 2001 From: Dave Allured Date: Fri, 22 Sep 2023 23:44:15 -0600 Subject: [PATCH 2/3] hdf5: Fix build with CLT 15.0 . Closes: https://trac.macports.org/ticket/68194 * Remove `-commons` from configure, not supported in Sonoma/CLT 15.0. * `-commons` no longer needed for HDF5 series 10.0 and later. Was fixed upstream: https://github.com/HDFGroup/hdf5/pull/3581 --- science/hdf5/files/patch-no-commons.diff | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 science/hdf5/files/patch-no-commons.diff diff --git a/science/hdf5/files/patch-no-commons.diff b/science/hdf5/files/patch-no-commons.diff new file mode 100644 index 0000000000000..57e1f96c92d56 --- /dev/null +++ b/science/hdf5/files/patch-no-commons.diff @@ -0,0 +1,17 @@ +--- a/configure 2023-08-10 16:57:56.000000000 -0600 ++++ b/configure 2023-09-22 23:08:25.000000000 -0600 +@@ -11228,14 +11228,6 @@ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if shared Fortran libraries are supported" >&5 + printf %s "checking if shared Fortran libraries are supported... " >&6; } + H5_FORTRAN_SHARED="yes" +- ## tell libtool to do the right thing with COMMON symbols, this fixes +- ## corrupt values with COMMON and EQUIVALENCE when building shared +- ## Fortran libraries on OSX with gnu and Intel compilers (HDFFV-2772). +- case "`uname`" in +- Darwin*) +- H5_LDFLAGS="$H5_LDFLAGS -Wl,-commons,use_dylibs" +- ;; +- esac + + ## Report results of check(s) + From 2f1efa5b017eeffb951d72781f37bebedd260d74 Mon Sep 17 00:00:00 2001 From: Dave Allured Date: Sat, 23 Sep 2023 00:00:09 -0600 Subject: [PATCH 3/3] hdf5: Fix build with CLT 15.0 . Closes: https://trac.macports.org/ticket/68194 * Remove `-commons` from configure, not supported in Sonoma/CLT 15.0. * `-commons` no longer needed for HDF5 series 10.0 and later. Was fixed upstream: https://github.com/HDFGroup/hdf5/pull/3581 --- science/hdf5/files/patch-no-commons.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/science/hdf5/files/patch-no-commons.diff b/science/hdf5/files/patch-no-commons.diff index 57e1f96c92d56..b4400b0ed490f 100644 --- a/science/hdf5/files/patch-no-commons.diff +++ b/science/hdf5/files/patch-no-commons.diff @@ -1,5 +1,5 @@ ---- a/configure 2023-08-10 16:57:56.000000000 -0600 -+++ b/configure 2023-09-22 23:08:25.000000000 -0600 +--- configure.orig 2023-08-10 16:57:56.000000000 -0600 ++++ configure 2023-09-22 23:08:25.000000000 -0600 @@ -11228,14 +11228,6 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if shared Fortran libraries are supported" >&5 printf %s "checking if shared Fortran libraries are supported... " >&6; }