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 2FBEC15808B for ; Fri, 25 Mar 2022 03:54:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58144E07D9; Fri, 25 Mar 2022 03:54:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 681E8E07D9 for ; Fri, 25 Mar 2022 03:54:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 37127342A50 for ; Fri, 25 Mar 2022 03:54:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79099250 for ; Fri, 25 Mar 2022 03:54:54 +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: <1648180485.99ec29149b8f511a4e99586d14ed6f11cdc5ed8d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/hwloc/hwloc-2.7.1-r1.ebuild sys-apps/hwloc/hwloc-2.7.1.ebuild X-VCS-Directories: sys-apps/hwloc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 99ec29149b8f511a4e99586d14ed6f11cdc5ed8d X-VCS-Branch: master Date: Fri, 25 Mar 2022 03:54:54 +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: 122f69fc-b945-443f-aa1a-68151309bbec X-Archives-Hash: 2e5e4fafb3a20dc842ea46520ddf3a33 commit: 99ec29149b8f511a4e99586d14ed6f11cdc5ed8d Author: Sam James gentoo org> AuthorDate: Fri Mar 25 03:49:17 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 25 03:54:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ec2914 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 gentoo.org> .../{hwloc-2.7.1.ebuild => hwloc-2.7.1-r1.ebuild} | 25 ++++++++++++++-------- 1 file 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 similarity index 81% rename from sys-apps/hwloc/hwloc-2.7.1.ebuild rename to 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"