commit:     bc5dde1e7ef9df22558d5ce424ab26208385d1d7
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 17:43:47 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 18:04:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc5dde1e

x11-drivers/nvidia-drivers: tc-export PKG_CONFIG

Noticed variable is used due to a change to utils.mk in 0/550 but
turns out there was already some use of it in nvidia-settings for
older versions too.

Just export it everywhere.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild      | 6 +++---
 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 +-
 x11-drivers/nvidia-drivers/nvidia-drivers-550.40.07.ebuild    | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index 364d03fab92d..f2017f7e7ee8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -148,7 +148,7 @@ src_prepare() {
 }
 
 src_compile() {
-       tc-export AR CC CXX LD OBJCOPY OBJDUMP
+       tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
        local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # 
raw-ldflags.patch
 
        # latest branches has proper fixes, but legacy have more issues and are
@@ -185,8 +185,8 @@ src_compile() {
 
        if use persistenced; then
                # 390.xx persistenced does not auto-detect libtirpc
-               LIBS=$($(tc-getPKG_CONFIG) --libs libtirpc || die) \
-                       common_cflags=$($(tc-getPKG_CONFIG) --cflags libtirpc 
|| die) \
+               LIBS=$(${PKG_CONFIG} --libs libtirpc || die) \
+                       common_cflags=$(${PKG_CONFIG} --cflags libtirpc || die) 
\
                        emake "${NV_ARGS[@]}" -C nvidia-persistenced
        fi
 

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 a81c071f8b6d..b9fea77a5a73 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild
@@ -145,7 +145,7 @@ src_prepare() {
 }
 
 src_compile() {
-       tc-export AR CC CXX LD OBJCOPY OBJDUMP
+       tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
        local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # 
raw-ldflags.patch
 
        # latest branches has proper fixes, but legacy have more issues and are

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 aa6b6a283fc6..de4150d9cc5f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild
@@ -174,7 +174,7 @@ options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' 
"${T}"/nvidia.conf || die
 }
 
 src_compile() {
-       tc-export AR CC CXX LD OBJCOPY OBJDUMP
+       tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
        local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # 
raw-ldflags.patch
 
        local xnvflags=-fPIC #840389

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 d4dacb1d7abb..af2df364068f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
@@ -177,7 +177,7 @@ options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' 
"${T}"/nvidia.conf || die
 }
 
 src_compile() {
-       tc-export AR CC CXX LD OBJCOPY OBJDUMP
+       tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
        local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # 
raw-ldflags.patch
 
        local xnvflags=-fPIC #840389

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 d4dacb1d7abb..af2df364068f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild
@@ -177,7 +177,7 @@ options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' 
"${T}"/nvidia.conf || die
 }
 
 src_compile() {
-       tc-export AR CC CXX LD OBJCOPY OBJDUMP
+       tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
        local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # 
raw-ldflags.patch
 
        local xnvflags=-fPIC #840389

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 1c4a52826bb9..43b0b7b53c76 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild
@@ -175,7 +175,7 @@ options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' 
"${T}"/nvidia.conf || die
 }
 
 src_compile() {
-       tc-export AR CC CXX LD OBJCOPY OBJDUMP
+       tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
        local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # 
raw-ldflags.patch
 
        local xnvflags=-fPIC #840389

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 88a0e7d208b5..4e57888236cf 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
@@ -167,7 +167,7 @@ src_prepare() {
 }
 
 src_compile() {
-       tc-export AR CC CXX LD OBJCOPY OBJDUMP
+       tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
 
        local xnvflags=-fPIC #840389
        # lto static libraries tend to cause problems without fat objects

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.07.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.07.ebuild
index 97ea955e360c..3536453083d0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.07.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.07.ebuild
@@ -159,7 +159,7 @@ src_prepare() {
 }
 
 src_compile() {
-       tc-export AR CC CXX LD OBJCOPY OBJDUMP
+       tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
 
        local xnvflags=-fPIC #840389
        # lto static libraries tend to cause problems without fat objects

Reply via email to