Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sys-apps/hwloc: cuda useflag now required for nvml #21608

Closed
wants to merge 5 commits into from
Closed

sys-apps/hwloc: cuda useflag now required for nvml #21608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b278b5
sys-apps/hwloc: cuda useflag now required for nvml
Alessandro-Barbieri Jul 12, 2021
9617f2a
profiles/arch/x86: mask sys-apps/hwloc[nvml]
Alessandro-Barbieri Oct 20, 2021
9ba1114
profiles/arch/amd64: mask sys-apps/hwloc[nvml] on stable
Alessandro-Barbieri Oct 20, 2021
8d0b9a6
sys-apps/hwloc: remove netloc blocker
Alessandro-Barbieri Oct 20, 2021
bba3bfe
sys-apps/hwloc: depend on sci-libs/scotch with USE=netloc
Alessandro-Barbieri Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions profiles/arch/amd64/package.use.stable.mask
View file
Open in desktop
Expand Up @@ -17,6 +17,10 @@

#--- END OF EXAMPLES ---

# Alessandro Barbieri <lssndrbarbieri@gmail.com> (2021-10-20)
# dev-util/nvidia-cuda-toolkit has no stable keywords
sys-apps/hwloc nvml

# Joonas Niilola <juippis@gentoo.org> (2021-08-13)
# dev-libs/efl is stabilized on amd64.
app-crypt/pinentry -efl
Expand Down
2 changes: 1 addition & 1 deletion profiles/arch/x86/package.use.mask
View file
Open in desktop
Expand Up @@ -348,7 +348,7 @@ app-editors/gvim -racket

# Kacper Kowalik <xarthisius@gentoo.org> (2013-08-09)
# Works on x86
sys-apps/hwloc -gl -nvml
sys-apps/hwloc -gl

# Diego Elio Pettenò <flameeyes@gentoo.org> (2012-11-03)
# Unmask here, as it's masked in base.
Expand Down
22 changes: 12 additions & 10 deletions sys-apps/hwloc/hwloc-2.3.0.ebuild
View file
Open in desktop
Expand Up @@ -21,17 +21,19 @@ IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"

RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]

cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
netloc? ( !sys-apps/netloc )
nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
pci? (
>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
)
cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
nvml? (
>=dev-util/nvidia-cuda-toolkit-6.5.19-r1:=
x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}]
)
pci? (
>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
)
udev? ( virtual/libudev )
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"

# 2.69-r5 for --runstatedir
Expand Down
104 changes: 104 additions & 0 deletions sys-apps/hwloc/hwloc-2.5.0-r1.ebuild
View file
Open in desktop
@@ -0,0 +1,104 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI="7"

inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal

MY_PV="v$(ver_cut 1-2)"

DESCRIPTION="displays the hardware topology in convenient formats"
HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"

LICENSE="BSD"
SLOT="0/15"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"

# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
# Anyone with hardware is welcome to step up and help test to get it re-added.

RDEPEND="
>=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]

cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
netloc? ( sci-libs/scotch )
nvml? (
>=dev-util/nvidia-cuda-toolkit-6.5.19-r1:=
x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}]
)
pci? (
>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
)
udev? ( virtual/libudev )
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}"

# 2.69-r5 for --runstatedir
BDEPEND="
>=sys-devel/autoconf-2.69-r5
virtual/pkgconfig
"

PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
DOCS=( AUTHORS NEWS README VERSION )

src_prepare() {
default
eautoreconf

if use cuda ; then
append-cflags "-I${ESYSROOT}/opt/cuda/include"
append-cppflags "-I${ESYSROOT}/opt/cuda/include"
fi
use netloc && append-cflags "-I${ESYSROOT}/usr/include/scotch"
}

multilib_src_configure() {
export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" #393467

if use cuda ; then
local -x LDFLAGS="${LDFLAGS}"
append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
fi

local myconf=(
--disable-opencl
--disable-plugin-ltdl
--enable-plugins
--enable-shared
--runstatedir="${EPREFIX}/run"
$(multilib_native_use_enable cuda)
$(multilib_native_use_enable gl)
$(use_enable cairo)
$(use_enable cpuid)
$(use_enable debug)
$(use_enable udev libudev)
$(use_enable netloc)
$(use_enable nvml)
$(use_enable pci)
$(use_enable static-libs static)
$(use_enable xml libxml2)
$(use_with X x)
)
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}

multilib_src_install_all() {
default
case ${ARCH} in
# hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
amd64|x86)
systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;;
esac
mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
bashcomp_alias hwloc-annotate \
hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
find "${ED}" -name '*.la' -delete || die
}
22 changes: 12 additions & 10 deletions sys-apps/hwloc/hwloc-2.5.0.ebuild
View file
Open in desktop
Expand Up @@ -21,17 +21,19 @@ IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"

RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]

cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
netloc? ( !sys-apps/netloc )
nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
pci? (
>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
)
cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
nvml? (
>=dev-util/nvidia-cuda-toolkit-6.5.19-r1:=
x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}]
)
pci? (
>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
)
udev? ( virtual/libudev )
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"

# 2.69-r5 for --runstatedir
Expand Down