[gentoo-commits] repo/gentoo:master commit in: sys-libs/libnvidia-container/

["Sam James" <sam@gentoo.org>]

commit:     b26069e3abc283132150b6a40a2a9db7c4421e48
Author:     Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Fri Apr 11 01:03:11 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 12 14:42:18 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26069e3

sys-libs/libnvidia-container: apply patch for go 1.24

go 1.24 is stabled, build failed w/o this patch

Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/41531
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libnvidia-container/libnvidia-container-1.17.2.ebuild | 15 +++++++++------
 .../libnvidia-container/libnvidia-container-1.17.3.ebuild |  1 +
 .../libnvidia-container/libnvidia-container-9999.ebuild   |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/sys-libs/libnvidia-container/libnvidia-container-1.17.2.ebuild b/sys-libs/libnvidia-container/libnvidia-container-1.17.2.ebuild
index a516201845eb..24b2ec9ba6f6 100644
--- a/sys-libs/libnvidia-container/libnvidia-container-1.17.2.ebuild
+++ b/sys-libs/libnvidia-container/libnvidia-container-1.17.2.ebuild
@@ -53,6 +53,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.17.0-fix-makefile-r1.patch"
+	"${FILESDIR}/${PN}-1.17.4-go-1.24.patch"
 )
 
 DOCS=( NOTICE README.md )
@@ -73,6 +74,13 @@ src_prepare() {
 	eapply -p1 "${S}"/mk/nvidia-modprobe.patch
 	popd || die
 
+	if ! tc-is-gcc; then
+		ewarn "libnvidia-container must be built with gcc because of option \"-fplan9-extensions\"!"
+		ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc"
+		export CC=${CHOST}-gcc AR=${CHOST}-gcc-ar
+		tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
+	fi
+
 	default
 }
 
@@ -84,12 +92,7 @@ src_configure() {
 	export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}"
 	export CGO_LDFLAGS="${CGO_LDFLAGS:-$LDFLAGS}"
 
-	tc-export CC LD OBJCOPY PKG_CONFIG
-
-	if ! tc-is-gcc; then
-		eerror "Building ${PN} with clang is not supported because of option \"-fplan9-extensions\"!"
-		die "$(tc-getCC) is not a supported compiler. Please use sys-devel/gcc"
-	fi
+	tc-export LD OBJCOPY PKG_CONFIG
 
 	# we could also set GO compiller, but it currently defaults to gccgo, but as for now I believe
 	# most users will prefer dev-lang/go and they usually don't define GO="go" their make.conf either.

diff --git a/sys-libs/libnvidia-container/libnvidia-container-1.17.3.ebuild b/sys-libs/libnvidia-container/libnvidia-container-1.17.3.ebuild
index 5d4b6cda8900..b1e9266e9b98 100644
--- a/sys-libs/libnvidia-container/libnvidia-container-1.17.3.ebuild
+++ b/sys-libs/libnvidia-container/libnvidia-container-1.17.3.ebuild
@@ -53,6 +53,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.17.0-fix-makefile-r1.patch"
+	"${FILESDIR}/${PN}-1.17.4-go-1.24.patch"
 )
 
 DOCS=( NOTICE README.md )

diff --git a/sys-libs/libnvidia-container/libnvidia-container-9999.ebuild b/sys-libs/libnvidia-container/libnvidia-container-9999.ebuild
index 5d4b6cda8900..b1e9266e9b98 100644
--- a/sys-libs/libnvidia-container/libnvidia-container-9999.ebuild
+++ b/sys-libs/libnvidia-container/libnvidia-container-9999.ebuild
@@ -53,6 +53,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.17.0-fix-makefile-r1.patch"
+	"${FILESDIR}/${PN}-1.17.4-go-1.24.patch"
 )
 
 DOCS=( NOTICE README.md )