| 1 |
commit: 7b5147d4ad8bb8149453c743042e87756d5e11e4 |
| 2 |
Author: Roman Beranek <roman.beranek <AT> prusa3d <DOT> com> |
| 3 |
AuthorDate: Tue May 31 23:02:59 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 31 23:43:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b5147d4 |
| 7 |
|
| 8 |
sci-libs/hdf5: fix cmake include dir regression |
| 9 |
|
| 10 |
An attempt to build hdf5-1.12.2-r1 with USE='fortran' on a system where |
| 11 |
an older version of the package has already been installed will fail due |
| 12 |
to system headers taking precedence over the ones present in the source |
| 13 |
directory. |
| 14 |
|
| 15 |
This exact issue (#808633) has already been fixed in 225b7ee for 1.12.1, |
| 16 |
though the workaround somehow hadn't made it into the new ebuild. This |
| 17 |
commit brings it in. |
| 18 |
|
| 19 |
Bug: HDFGroup/hdf5#1027 |
| 20 |
Closes: https://bugs.gentoo.org/808633 |
| 21 |
Signed-off-by: Roman Beranek <roman.beranek <AT> prusa3d.com> |
| 22 |
Closes: https://github.com/gentoo/gentoo/pull/25712 |
| 23 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 24 |
|
| 25 |
sci-libs/hdf5/hdf5-1.12.2-r1.ebuild | 4 ++++ |
| 26 |
1 file changed, 4 insertions(+) |
| 27 |
|
| 28 |
diff --git a/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild |
| 29 |
index d5390cee5762..325f24396b29 100644 |
| 30 |
--- a/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild |
| 31 |
+++ b/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild |
| 32 |
@@ -64,6 +64,10 @@ pkg_setup() { |
| 33 |
src_configure() { |
| 34 |
use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620 |
| 35 |
local mycmakeargs=( |
| 36 |
+ # Workaround needed to allow build with USE=fortran when an older |
| 37 |
+ # version is installed. See bug #808633 and |
| 38 |
+ # https://github.com/HDFGroup/hdf5/issues/1027 upstream. |
| 39 |
+ -DCMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE=ON |
| 40 |
-DBUILD_STATIC_LIBS=OFF |
| 41 |
-DONLY_SHARED_LIBS=ON |
| 42 |
-DFETCHCONTENT_FULLY_DISCONNECTED=ON |
Archives