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 82AC9158083 for ; Fri, 6 Sep 2024 08:52:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C37E2BC03A; Fri, 6 Sep 2024 08:52:19 +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 0C0422BC03B for ; Fri, 6 Sep 2024 08:52:19 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5682E343057 for ; Fri, 6 Sep 2024 08:52:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FCB21F59 for ; Fri, 6 Sep 2024 08:52:15 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1725612453.010a72f5cb7d9e08155844b03b3cf1086ad34fbd.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-libs/libnvidia-container/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-libs/libnvidia-container/libnvidia-container-9999.ebuild X-VCS-Directories: sys-libs/libnvidia-container/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 010a72f5cb7d9e08155844b03b3cf1086ad34fbd X-VCS-Branch: master Date: Fri, 6 Sep 2024 08:52:15 +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: 8197211c-7a9a-4231-b5ec-869fa4fefbec X-Archives-Hash: 4af968fca905aaace691ff2ffc6accb7 commit: 010a72f5cb7d9e08155844b03b3cf1086ad34fbd Author: Denis Strizhkin gmail com> AuthorDate: Fri Sep 6 08:47:33 2024 +0000 Commit: David Roman gmail com> CommitDate: Fri Sep 6 08:47:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=010a72f5 sys-libs/libnvidia-container: fix 9999 ebuild Signed-off-by: Denis Strizhkin gmail.com> .../libnvidia-container-9999.ebuild | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sys-libs/libnvidia-container/libnvidia-container-9999.ebuild b/sys-libs/libnvidia-container/libnvidia-container-9999.ebuild index 2aa3cbf3f..b7d6fa9e1 100644 --- a/sys-libs/libnvidia-container/libnvidia-container-9999.ebuild +++ b/sys-libs/libnvidia-container/libnvidia-container-9999.ebuild @@ -15,12 +15,14 @@ if [[ "${PV}" == "9999" ]] ; then else SRC_URI=" https://github.com/NVIDIA/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz - https://github.com/NVIDIA/nvidia-modprobe/archive/${NVMODV}.tar.gz -> ${PN}-nvidia-modprobe-${NVMODV}.tar.gz " S="${WORKDIR}/${PN}-${PV/_rc/-rc.}" - NVMODS="${WORKDIR}/nvidia-modprobe-${NVMODV}" KEYWORDS="~amd64" fi +NVMODS="${WORKDIR}/nvidia-modprobe-${NVMODV}" +SRC_URI+=" + https://github.com/NVIDIA/nvidia-modprobe/archive/${NVMODV}.tar.gz -> ${PN}-nvidia-modprobe-${NVMODV}.tar.gz +" LICENSE="Apache-2.0" SLOT="0/${PV}" @@ -50,6 +52,13 @@ PATCHES=( DOCS=( COPYING COPYING.LESSER LICENSE NOTICE README.md) +src_unpack() { + default_src_unpack + if [[ "${PV}" == "9999" ]] ; then + git-r3_src_unpack + fi +} + src_prepare() { # nvidia-modprobe patching based on libnvidia-container/mk/nvidia-modprobe.mk mkdir -p "${S}"/deps/src/nvidia-modprobe-"${NVMODV}" || die @@ -69,10 +78,7 @@ src_compile() { emake \ CGO_CFLAGS="${CFLAGS}" \ CGO_LDFLAGS="${LDFLAGS}" \ - GO_LDFLAGS="-compressdwarf=false -linkmode=external" \ - REVISION="${PV}" \ - LIB_VERSION="${MY_LIB_VERSION}" \ - LIB_TAG="${MY_LIB_TAG}" + GO_LDFLAGS="-compressdwarf=false -linkmode=external" } src_install() { @@ -80,9 +86,6 @@ src_install() { CGO_CFLAGS="${CFLAGS}" \ CGO_LDFLAGS="${LDFLAGS}" \ GO_LDFLAGS="-compressdwarf=false -linkmode=external" \ - REVISION="${PV}" \ - LIB_VERSION="${MY_LIB_VERSION}" \ - LIB_TAG="${MY_LIB_TAG}" \ DESTDIR="${D}" \ install # Install docs