diff options
| author |   Sam James <sam@gentoo.org> | 2022-03-25 03:49:17 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-03-25 03:54:45 +0000 |
| commit | 99ec29149b8f511a4e99586d14ed6f11cdc5ed8d (patch) | |
| tree | 24363b16f369d6deb92df00768b71e2a248f5ff5 /sys-apps/hwloc | |
| parent | Revert "app-containers/podman: add cgroup-hybrid USE flag" (diff) | |
| download | gentoo-99ec29149b8f511a4e99586d14ed6f11cdc5ed8d.tar.gz gentoo-99ec29149b8f511a4e99586d14ed6f11cdc5ed8d.tar.bz2 gentoo-99ec29149b8f511a4e99586d14ed6f11cdc5ed8d.zip | |
sys-apps/hwloc: fixup nvidia dependencies
- USE=tools isn't needed for nvidia-drivers (thanks Ionen!)
- addpredict for nvidia to avoid sandbox violation
- Add additional USE=video_cards_nvidia deps (only for this case, not in general)
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/hwloc')
| -rw-r--r-- | sys-apps/hwloc/hwloc-2.7.1-r1.ebuild (renamed from sys-apps/hwloc/hwloc-2.7.1.ebuild) | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/sys-apps/hwloc/hwloc-2.7.1.ebuild b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild index 7b677fb68d16..132b2e9fc5e2 100644 --- a/sys-apps/hwloc/hwloc-2.7.1.ebuild +++ b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild @@ -15,9 +15,10 @@ 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 nvml +pci static-libs svg udev xml X video_cards_nvidia" -# opencl support dropped with x11-drivers/ati-drivers being removed (bug #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}] +# opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406). +# anyone with hardware is welcome to step up and help test to get it re-added. +# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4 +RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] ) @@ -25,15 +26,17 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}] >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev ) + udev? ( virtual/libudev:= ) xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers[static-libs,tools] )" + video_cards_nvidia? ( + x11-drivers/nvidia-drivers[static-libs] + x11-libs/libXext + x11-libs/libX11 + )" DEPEND="${RDEPEND}" # 2.69-r5 for --runstatedir -BDEPEND=" - >=sys-devel/autoconf-2.69-r5 - virtual/pkgconfig -" +BDEPEND=">=sys-devel/autoconf-2.69-r5 + virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) @@ -49,6 +52,10 @@ multilib_src_configure() { # bug #393467 export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" + if use video_cards_nvidia ; then + addpredict /dev/nvidiactl + fi + if use cuda ; then append-cflags "-I${ESYSROOT}/opt/cuda/include" append-cppflags "-I${ESYSROOT}/opt/cuda/include" |