From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C07E9158091 for ; Tue, 31 May 2022 23:44:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AE73E087E; Tue, 31 May 2022 23:44:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1D06E087E for ; Tue, 31 May 2022 23:44:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A05DA341B6D for ; Tue, 31 May 2022 23:44:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15ED43C3 for ; Tue, 31 May 2022 23:44:01 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1654040621.7b5147d4ad8bb8149453c743042e87756d5e11e4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/hdf5/hdf5-1.12.2-r1.ebuild X-VCS-Directories: sci-libs/hdf5/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7b5147d4ad8bb8149453c743042e87756d5e11e4 X-VCS-Branch: master Date: Tue, 31 May 2022 23:44:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 52894926-391e-468d-b29e-a03e7e7509c7 X-Archives-Hash: 91bf16bc1b80bb1ba25de8068863b12b commit: 7b5147d4ad8bb8149453c743042e87756d5e11e4 Author: Roman Beranek prusa3d com> AuthorDate: Tue May 31 23:02:59 2022 +0000 Commit: Sam James gentoo 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 prusa3d.com> Closes: https://github.com/gentoo/gentoo/pull/25712 Signed-off-by: Sam James 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