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

["Sam James" <sam@gentoo.org>]

commit:     7b5147d4ad8bb8149453c743042e87756d5e11e4
Author:     Roman Beranek <roman.beranek <AT> prusa3d <DOT> com>
AuthorDate: Tue May 31 23:02:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 31 23:43:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b5147d4

sci-libs/hdf5: fix cmake include dir regression

An attempt to build hdf5-1.12.2-r1 with USE='fortran' on a system where
an older version of the package has already been installed will fail due
to system headers taking precedence over the ones present in the source
directory.

This exact issue (#808633) has already been fixed in 225b7ee for 1.12.1,
though the workaround somehow hadn't made it into the new ebuild. This
commit brings it in.

Bug: HDFGroup/hdf5#1027
Closes: https://bugs.gentoo.org/808633
Signed-off-by: Roman Beranek <roman.beranek <AT> prusa3d.com>
Closes: https://github.com/gentoo/gentoo/pull/25712
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/hdf5/hdf5-1.12.2-r1.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild
index d5390cee5762..325f24396b29 100644
--- a/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild
@@ -64,6 +64,10 @@ pkg_setup() {
 src_configure() {
 	use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
 	local mycmakeargs=(
+		# Workaround needed to allow build with USE=fortran when an older
+		# version is installed. See bug #808633 and
+		# https://github.com/HDFGroup/hdf5/issues/1027 upstream.
+		-DCMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE=ON
 		-DBUILD_STATIC_LIBS=OFF
 		-DONLY_SHARED_LIBS=ON
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON