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 62FF5158020 for ; Tue, 27 Dec 2022 11:11:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B549E07E0; Tue, 27 Dec 2022 11:11:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 3D9B9E07E0 for ; Tue, 27 Dec 2022 11:11:47 +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 265C93410C2 for ; Tue, 27 Dec 2022 11:11:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7645E7F0 for ; Tue, 27 Dec 2022 11:11:44 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1672139473.1753a9ff5a1b4345e2db281c2f5b72538e667191.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 1753a9ff5a1b4345e2db281c2f5b72538e667191 X-VCS-Branch: master Date: Tue, 27 Dec 2022 11:11:44 +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: e33bf8d0-49eb-4b09-b83a-0db9339b9dd5 X-Archives-Hash: 06b5796156b96a8f656e7e4b8183b1cf commit: 1753a9ff5a1b4345e2db281c2f5b72538e667191 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Dec 27 04:06:31 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Dec 27 11:11:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1753a9ff x11-drivers/nvidia-drivers: use -ffat-lto-objects for libXNVCtrl.a When using lto, prevents revdeps from getting e.g. ld.lld: error: undefined symbol: XNVCTRLQueryTargetAttribute Having these may also help other issues like mismatches. Skipping 0/390 given doesn't support XNVCTRL_CFLAGS, and 390 is hardly supported at this point (EOL). Not worth a revbump, will propagate as people upgrade their kernels. Signed-off-by: Ionen Wolkens gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild | 6 +++++- x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild | 6 +++++- x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild | 6 +++++- x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild | 6 +++++- x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild index d77f701b21a3..3d9b38865127 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild @@ -238,13 +238,17 @@ src_compile() { tc-export AR CC CXX LD OBJCOPY OBJDUMP local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch + local xnvflags=-fPIC #840389 + # lto static libraries tend to cause problems without fat objects + is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + NV_ARGS=( PREFIX="${EPREFIX}"/usr HOST_CC="$(tc-getBUILD_CC)" HOST_LD="$(tc-getBUILD_LD)" NV_USE_BUNDLED_LIBJANSSON=0 NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out - XNVCTRL_CFLAGS=-fPIC #840389 + XNVCTRL_CFLAGS="${xnvflags}" ) if use driver; then diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild index 59fc91ba2250..7b5d31e0e448 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild @@ -242,13 +242,17 @@ src_compile() { tc-export AR CC CXX LD OBJCOPY OBJDUMP local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch + local xnvflags=-fPIC #840389 + # lto static libraries tend to cause problems without fat objects + is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + NV_ARGS=( PREFIX="${EPREFIX}"/usr HOST_CC="$(tc-getBUILD_CC)" HOST_LD="$(tc-getBUILD_LD)" NV_USE_BUNDLED_LIBJANSSON=0 NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out - XNVCTRL_CFLAGS=-fPIC #840389 + XNVCTRL_CFLAGS="${xnvflags}" ) if use driver; then diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild index 1f7131bc1b56..8a3fe05070aa 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild @@ -267,6 +267,10 @@ src_compile() { tc-export AR CC CXX LD OBJCOPY OBJDUMP local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch + local xnvflags=-fPIC #840389 + # lto static libraries tend to cause problems without fat objects + is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + NV_ARGS=( PREFIX="${EPREFIX}"/usr HOST_CC="$(tc-getBUILD_CC)" @@ -274,7 +278,7 @@ src_compile() { NV_USE_BUNDLED_LIBJANSSON=0 NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out WAYLAND_AVAILABLE=$(usex wayland 1 0) - XNVCTRL_CFLAGS=-fPIC #840389 + XNVCTRL_CFLAGS="${xnvflags}" ) if use driver; then diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild index a58c7e3e26c1..6eacd648125b 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild @@ -263,6 +263,10 @@ src_compile() { tc-export AR CC CXX LD OBJCOPY OBJDUMP local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch + local xnvflags=-fPIC #840389 + # lto static libraries tend to cause problems without fat objects + is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + NV_ARGS=( PREFIX="${EPREFIX}"/usr HOST_CC="$(tc-getBUILD_CC)" @@ -271,7 +275,7 @@ src_compile() { NV_USE_BUNDLED_LIBJANSSON=0 NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out WAYLAND_AVAILABLE=$(usex wayland 1 0) - XNVCTRL_CFLAGS=-fPIC #840389 + XNVCTRL_CFLAGS="${xnvflags}" ) if use driver; then diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild index 231c52eeed6a..94ee75c658a2 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild @@ -262,6 +262,10 @@ src_compile() { tc-export AR CC CXX LD OBJCOPY OBJDUMP local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch + local xnvflags=-fPIC #840389 + # lto static libraries tend to cause problems without fat objects + is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + NV_ARGS=( PREFIX="${EPREFIX}"/usr HOST_CC="$(tc-getBUILD_CC)" @@ -270,7 +274,7 @@ src_compile() { NV_USE_BUNDLED_LIBJANSSON=0 NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out WAYLAND_AVAILABLE=$(usex wayland 1 0) - XNVCTRL_CFLAGS=-fPIC #840389 + XNVCTRL_CFLAGS="${xnvflags}" ) if use driver; then