commit: aec2451e54f828fc187aeee833d9fb64b0a8316a Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Thu Jan 18 21:50:08 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Jan 24 20:54:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec2451e
x11-drivers/nvidia-drivers: migrate checking for enabled lto, to tc-is-lto This toolchain func was recently added, and is a lot more reliable than get-flagq, for example if the active flags contain `-flto -fno-lto` then tc-is-lto gets it correct. We would rather use this wherever possible. Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34996 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild index b9fea77a5a73..36142dbc5a6d 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild @@ -162,7 +162,7 @@ src_compile() { local xnvflags=-fPIC #840389 # lto static libraries tend to cause problems without fat objects - is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" NV_ARGS=( PREFIX="${EPREFIX}"/usr diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild index de4150d9cc5f..df13ac50f4b9 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild @@ -179,7 +179,7 @@ src_compile() { local xnvflags=-fPIC #840389 # lto static libraries tend to cause problems without fat objects - is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" NV_ARGS=( PREFIX="${EPREFIX}"/usr diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild index af2df364068f..5b949b48cd04 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild @@ -182,7 +182,7 @@ src_compile() { local xnvflags=-fPIC #840389 # lto static libraries tend to cause problems without fat objects - is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" NV_ARGS=( PREFIX="${EPREFIX}"/usr diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild index af2df364068f..5b949b48cd04 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild @@ -182,7 +182,7 @@ src_compile() { local xnvflags=-fPIC #840389 # lto static libraries tend to cause problems without fat objects - is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" NV_ARGS=( PREFIX="${EPREFIX}"/usr diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild index 43b0b7b53c76..b13548c43466 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild @@ -180,7 +180,7 @@ src_compile() { local xnvflags=-fPIC #840389 # lto static libraries tend to cause problems without fat objects - is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" NV_ARGS=( PREFIX="${EPREFIX}"/usr diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild index 4e57888236cf..511984ae0ecd 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild @@ -171,7 +171,7 @@ src_compile() { local xnvflags=-fPIC #840389 # lto static libraries tend to cause problems without fat objects - is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" + tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)" NV_ARGS=( PREFIX="${EPREFIX}"/usr
