diff options
| author |   Sam James <sam@gentoo.org> | 2023-12-17 09:31:15 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-12-17 09:31:23 +0000 |
| commit | b1d7fc92778540233048297ff682e789a8d38ce5 (patch) | |
| tree | a68c14001093f236231d74bd18ed320ecb9c20b6 /sci-libs | |
| parent | sci-libs/caffe2: enable nvidia-cuda-toolkit-12 (diff) | |
| download | gentoo-b1d7fc92778540233048297ff682e789a8d38ce5.tar.gz gentoo-b1d7fc92778540233048297ff682e789a8d38ce5.tar.bz2 gentoo-b1d7fc92778540233048297ff682e789a8d38ce5.zip | |
sci-libs/hdf5: fix -Werror mangling, rebase patches
Closes: https://bugs.gentoo.org/917448
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-libs')
4 files changed, 99 insertions, 2 deletions
diff --git a/sci-libs/hdf5/files/hdf5-1.14.2-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch b/sci-libs/hdf5/files/hdf5-1.14.2-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch new file mode 100644 index 000000000000..91ed578ccc14 --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.14.2-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch @@ -0,0 +1,28 @@ +From 1a5293a30594afbfd3a24899e055429046a47837 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 17 Dec 2023 09:25:43 +0000 +Subject: [PATCH 1/3] Make sure that during runtime we'll use the same + libgfortran as during linking + +Bug: https://bugs.gentoo.org/419991 +Bug: https://bugs.gentoo.org/419895 +Signed-off-by: Sam James <sam@gentoo.org> +--- + fortran/src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am +index d42a41d..2b2a316 100644 +--- a/fortran/src/Makefile.am ++++ b/fortran/src/Makefile.am +@@ -96,6 +96,7 @@ if BUILD_PARALLEL_CONDITIONAL + else + H5FC_NAME = h5fc + endif ++H5test_kind_LDFLAGS=-static-libgfortran + + # Rules for automatically detecting which fortran types are present + # and matching them to C types. This is accomplished using helper +-- +2.43.0 + diff --git a/sci-libs/hdf5/files/hdf5-1.14.2-0002-Disable-forced-stripping.patch b/sci-libs/hdf5/files/hdf5-1.14.2-0002-Disable-forced-stripping.patch new file mode 100644 index 000000000000..646950c62167 --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.14.2-0002-Disable-forced-stripping.patch @@ -0,0 +1,31 @@ +From 260c90de63af19ff96fcf735d75d497356747788 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 17 Dec 2023 09:26:33 +0000 +Subject: [PATCH 2/3] Disable forced stripping + +Bug: https://bugs.gentoo.org/665378 +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index baad732..8c6b6f4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2183,9 +2183,9 @@ case "X-$SYMBOLS" in + AC_MSG_RESULT([yes]) + ;; + X-no) +- H5_CFLAGS="$H5_CFLAGS $NO_SYMBOLS_CFLAGS" +- H5_CXXFLAGS="$H5_CXXFLAGS $NO_SYMBOLS_CXXFLAGS" +- H5_FCFLAGS="$H5_FCFLAGS $NO_SYMBOLS_FCFLAGS" ++ H5_CFLAGS="$H5_CFLAGS" ++ H5_CXXFLAGS="$H5_CXXFLAGS" ++ H5_FCFLAGS="$H5_FCFLAGS" + AC_MSG_RESULT([no]) + ;; + *) +-- +2.43.0 + diff --git a/sci-libs/hdf5/files/hdf5-1.14.2-0003-Drop-broken-Werror-stripping.patch b/sci-libs/hdf5/files/hdf5-1.14.2-0003-Drop-broken-Werror-stripping.patch new file mode 100644 index 000000000000..fbe69dcadb92 --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.14.2-0003-Drop-broken-Werror-stripping.patch @@ -0,0 +1,37 @@ +From 5c87a2125ca2620de633e33a52020d12b7661da8 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 17 Dec 2023 09:27:18 +0000 +Subject: [PATCH 3/3] Drop broken -Werror stripping + +The stripping is broken and mangles -Werror=x -> -x [0]. + +[0] https://github.com/HDFGroup/hdf5/commit/41526f68f3482f2b3a7aa581288bc86e9c6dcb43#r100076265 + +Bug: https://bugs.gentoo.org/917448 +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8c6b6f4..a66830e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -189,14 +189,6 @@ saved_user_JAVAFLAGS="$JAVAFLAGS" + saved_user_LDFLAGS="$LDFLAGS" + saved_user_CPPFLAGS="$CPPFLAGS" + +-## Strip out -Werror from CFLAGS since that can cause checks to fail when +-## compiling the test program fails due to warnings +-CFLAGS="`echo $CFLAGS | sed -e 's/-Werror//g'`" +-CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-Werror//g'`" +-FCFLAGS="`echo $FCFLAGS | sed -e 's/-Werror//g'`" +-JAVACFLAGS="`echo $JAVACFLAGS | sed -e 's/-Werror//g'`" +-CPPFLAGS="`echo $CPPFLAGS | sed -e 's/-Werror//g'`" +- + ## Support F9X variable to define Fortran compiler if FC variable is + ## not used. This should be deprecated in the future. + if test "x" = "x$FC"; then +-- +2.43.0 + diff --git a/sci-libs/hdf5/hdf5-1.14.2.ebuild b/sci-libs/hdf5/hdf5-1.14.2.ebuild index 0cd8c97ec4cf..b40823d3c6b7 100644 --- a/sci-libs/hdf5/hdf5-1.14.2.ebuild +++ b/sci-libs/hdf5/hdf5-1.14.2.ebuild @@ -37,8 +37,9 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch - "${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.patch + "${FILESDIR}"/hdf5-1.14.2-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch + "${FILESDIR}"/hdf5-1.14.2-0002-Disable-forced-stripping.patch + "${FILESDIR}"/hdf5-1.14.2-0003-Drop-broken-Werror-stripping.patch ) pkg_setup() { |