[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/files/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/files/

[Sam James]

commit:     5dc5ca1f7ee5908d7d5e49814d154ce59848add9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 02:35:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  3 02:35:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc5ca1f

sci-libs/hdf5: add link to upstream PR for patch

Bug: https://github.com/HDFGroup/hdf5/pull/1716
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch b/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch
index 8218f31aea66..6ea7520c0f13 100644
--- a/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch
+++ b/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch
@@ -1,3 +1,4 @@
+https://github.com/HDFGroup/hdf5/pull/1716
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -46,6 +46,13 @@ if (CMAKE_VERSION VERSION_LESS "3.14.0")

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/files/

[Andrew Ammerlaan]

commit:     eed0d90c361035f9c51298398a0a1e9d0ec4cc68
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 13 16:48:12 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 19:48:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed0d90c

sci-libs/hdf5: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31426
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../hdf5/files/hdf5-1.14.0-fix-include-path.patch  | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/sci-libs/hdf5/files/hdf5-1.14.0-fix-include-path.patch b/sci-libs/hdf5/files/hdf5-1.14.0-fix-include-path.patch
deleted file mode 100644
index 4530f1fa6d2e..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.14.0-fix-include-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/904515
-https://github.com/HDFGroup/hdf5/issues/2422
-https://github.com/HDFGroup/hdf5/issues/2621
-https://github.com/HDFGroup/hdf5/pull/2667
-https://github.com/HDFGroup/hdf5/commit/b77cb393b884c1dbdaffb300aa8c4967d9ba7fb0
-
-From b77cb393b884c1dbdaffb300aa8c4967d9ba7fb0 Mon Sep 17 00:00:00 2001
-From: jhendersonHDF <jhenderson@hdfgroup.org>
-Date: Tue, 11 Apr 2023 14:31:25 -0500
-Subject: [PATCH] Fix improper include of build directory (#2422, #2621)
- (#2667)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -3012,8 +3012,7 @@ SUBFILING_VFD=no
- HAVE_MERCURY="no"
- 
- ## Always include subfiling directory so public header files are available
--CPPFLAGS="$CPPFLAGS -I$ac_abs_confdir/src/H5FDsubfiling"
--AM_CPPFLAGS="$AM_CPPFLAGS -I$ac_abs_confdir/src/H5FDsubfiling"
-+H5_CPPFLAGS="$H5_CPPFLAGS -I$ac_abs_confdir/src/H5FDsubfiling"
- 
- AC_MSG_CHECKING([if the subfiling I/O virtual file driver (VFD) is enabled])
- 
-@@ -3061,8 +3060,7 @@ if test "X$SUBFILING_VFD" = "Xyes"; then
-     mercury_dir="$ac_abs_confdir/src/H5FDsubfiling/mercury"
-     mercury_inc="$mercury_dir/src/util"
- 
--    CPPFLAGS="$CPPFLAGS -I$mercury_inc"
--    AM_CPPFLAGS="$AM_CPPFLAGS -I$mercury_inc"
-+    H5_CPPFLAGS="$H5_CPPFLAGS -I$mercury_inc"
- 
-     HAVE_STDATOMIC_H="yes"
-     AC_CHECK_HEADERS([stdatomic.h],,[HAVE_STDATOMIC_H="no"])