commit:     011317f7219780f4e725bce7d04fe22829190d39
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  8 20:51:43 2026 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  9 22:12:40 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=011317f7

sys-cluster/legion: Drop IUSE hwloc

Bug: https://bugs.gentoo.org/971009
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...legion-9999.ebuild => legion-23.03.0-r1.ebuild} | 24 ++++++++++++++--------
 sys-cluster/legion/legion-9999.ebuild              | 12 +++++------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/sys-cluster/legion/legion-9999.ebuild 
b/sys-cluster/legion/legion-23.03.0-r1.ebuild
similarity index 61%
copy from sys-cluster/legion/legion-9999.ebuild
copy to sys-cluster/legion/legion-23.03.0-r1.ebuild
index 188222290cd2..dd175a4f5eda 100644
--- a/sys-cluster/legion/legion-9999.ebuild
+++ b/sys-cluster/legion/legion-23.03.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
-DESCRIPTION="A data-centric parallel programming system"
+DESCRIPTION="Data-centric parallel programming system"
 HOMEPAGE="https://legion.stanford.edu/";
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
@@ -13,24 +13,32 @@ if [[ ${PV} == 9999 ]]; then
 else
        SRC_URI="https://github.com/StanfordLegion/legion/archive/${P}.tar.gz";
        S="${WORKDIR}"/${PN}-${P}
-
        KEYWORDS="~amd64"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples gasnet hwloc test"
+IUSE="examples gasnet test"
 RESTRICT="!test? ( test )"
 
+# https://github.com/StanfordLegion/legion/issues/575 re <hwloc-2
 # See bug #821424 for examples/mpi
 DEPEND="examples? ( virtual/mpi[cxx] )
-       gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-       hwloc? ( <sys-apps/hwloc-2:= )"
+       gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+       "${FILESDIR}"/${P}-gcc13.patch
+)
+
 src_configure() {
+       # -Werror=odr
+       # https://bugs.gentoo.org/863731
+       # Fixed upstream / in live ebuild.
+       filter-lto
+
        local mycmakeargs=(
-               -DLegion_USE_HWLOC=$(usex hwloc)
+               -DLegion_USE_HWLOC=OFF # security cleanup of <hwloc-2
                -DLegion_USE_GASNet=$(usex gasnet)
                -DLegion_ENABLE_TESTING=$(usex test)
                -DLegion_BUILD_EXAMPLES=$(usex examples)

diff --git a/sys-cluster/legion/legion-9999.ebuild 
b/sys-cluster/legion/legion-9999.ebuild
index 188222290cd2..9e2ee179604d 100644
--- a/sys-cluster/legion/legion-9999.ebuild
+++ b/sys-cluster/legion/legion-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake
 
-DESCRIPTION="A data-centric parallel programming system"
+DESCRIPTION="Data-centric parallel programming system"
 HOMEPAGE="https://legion.stanford.edu/";
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
@@ -13,24 +13,22 @@ if [[ ${PV} == 9999 ]]; then
 else
        SRC_URI="https://github.com/StanfordLegion/legion/archive/${P}.tar.gz";
        S="${WORKDIR}"/${PN}-${P}
-
        KEYWORDS="~amd64"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples gasnet hwloc test"
+IUSE="examples gasnet test"
 RESTRICT="!test? ( test )"
 
 # See bug #821424 for examples/mpi
 DEPEND="examples? ( virtual/mpi[cxx] )
-       gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-       hwloc? ( <sys-apps/hwloc-2:= )"
+       gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               -DLegion_USE_HWLOC=$(usex hwloc)
+               -DLegion_USE_HWLOC=OFF # security cleanup of <hwloc-2
                -DLegion_USE_GASNet=$(usex gasnet)
                -DLegion_ENABLE_TESTING=$(usex test)
                -DLegion_BUILD_EXAMPLES=$(usex examples)

Reply via email to