From 08c830ae249905e2c7210d11f4d8a63ee83430e2 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Sun, 11 Dec 2022 22:14:20 -0500 Subject: x11-drivers/nvidia-drivers: sync older ebuilds No real impact, just to have less unneeded differences. wrt 510 there's technically dbus.conf, but realistically nobody uses nvidia-powerd with older drivers and does not need a revbump Signed-off-by: Ionen Wolkens --- x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild | 3 +-- x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild | 3 +-- x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild | 7 ++++--- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'x11-drivers') diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild index 6ea20ca7ebb2..a1e518e63637 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild @@ -239,6 +239,7 @@ src_prepare() { src_compile() { tc-export AR CC CXX LD OBJCOPY OBJDUMP + local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch NV_ARGS=( PREFIX="${EPREFIX}"/usr @@ -278,9 +279,7 @@ src_compile() { if use tools; then # cflags: avoid noisy logs, only use here and set first to let override - # ldflags: abi currently needed if LD=ld.lld CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \ - RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \ emake "${NV_ARGS[@]}" -C nvidia-settings elif use static-libs; then emake "${NV_ARGS[@]}" -C nvidia-settings/src build-xnvctrl 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 dfcd6f0572c8..5fd92cb94704 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild @@ -236,6 +236,7 @@ src_prepare() { src_compile() { tc-export AR CC CXX LD OBJCOPY OBJDUMP + local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch NV_ARGS=( PREFIX="${EPREFIX}"/usr @@ -270,9 +271,7 @@ src_compile() { if use tools; then # cflags: avoid noisy logs, only use here and set first to let override - # ldflags: abi currently needed if LD=ld.lld CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \ - RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \ emake "${NV_ARGS[@]}" -C nvidia-settings elif use static-libs; then emake "${NV_ARGS[@]}" -C nvidia-settings/src out/libXNVCtrl.a 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 db57305fb47d..491ef94a9b59 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild @@ -240,6 +240,7 @@ src_prepare() { src_compile() { tc-export AR CC CXX LD OBJCOPY OBJDUMP + local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch NV_ARGS=( PREFIX="${EPREFIX}"/usr @@ -274,9 +275,7 @@ src_compile() { if use tools; then # cflags: avoid noisy logs, only use here and set first to let override - # ldflags: abi currently needed if LD=ld.lld CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \ - RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \ emake "${NV_ARGS[@]}" -C nvidia-settings elif use static-libs; then emake "${NV_ARGS[@]}" -C nvidia-settings/src out/libXNVCtrl.a @@ -461,7 +460,9 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers" # MODULE:powerd extras if use amd64; then systemd_dounit systemd/system/nvidia-powerd.service - dodoc nvidia-dbus.conf + + insinto /usr/share/dbus-1/system.d + doins nvidia-dbus.conf fi # symlink non-versioned so nvidia-settings can use it even if misdetected -- cgit v1.2.3-65-gdbad