| 1 |
commit: 68c9089b79a78e3352c7c92e229d141d1ccf60f3 |
| 2 |
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Apr 25 08:51:22 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 25 08:51:22 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c9089b |
| 7 |
|
| 8 |
x11-drivers/nvidia-drivers: prevent 390.xx abi_x86_32 GLX segfault |
| 9 |
|
| 10 |
Regression since 390.141-r1. |
| 11 |
|
| 12 |
Alternate libnvidia-tls.so from the tls/ directory is necessary for |
| 13 |
390.xx branch and legacy libglx.so but wasn't used with abi_x86_32. |
| 14 |
|
| 15 |
-d 32 test is for x86 keyword without the directory (wasn't affected). |
| 16 |
|
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/20520 |
| 18 |
Closes: https://bugs.gentoo.org/785289 |
| 19 |
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com> |
| 20 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 21 |
|
| 22 |
...-drivers-390.141-r1.ebuild => nvidia-drivers-390.141-r2.ebuild} | 7 ++++++- |
| 23 |
...dia-drivers-390.143.ebuild => nvidia-drivers-390.143-r1.ebuild} | 7 ++++++- |
| 24 |
2 files changed, 12 insertions(+), 2 deletions(-) |
| 25 |
|
| 26 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild |
| 27 |
similarity index 98% |
| 28 |
rename from x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild |
| 29 |
rename to x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild |
| 30 |
index 5c16a5b14be..50b08991c3f 100644 |
| 31 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild |
| 32 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild |
| 33 |
@@ -138,6 +138,12 @@ src_prepare() { |
| 34 |
|
| 35 |
default |
| 36 |
|
| 37 |
+ # alternate tls library needed for 390's libglx.so (bug #785289) |
| 38 |
+ mv tls/libnvidia-tls.so.${PV} . || die |
| 39 |
+ if [[ -d 32 ]]; then |
| 40 |
+ mv 32/tls/libnvidia-tls.so.${PV} 32 || die |
| 41 |
+ fi |
| 42 |
+ |
| 43 |
# prevent detection of incomplete kernel DRM support (bug #603818) |
| 44 |
sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \ |
| 45 |
-i kernel/conftest.sh || die |
| 46 |
@@ -337,7 +343,6 @@ src_install() { |
| 47 |
doman nvidia-smi.1 |
| 48 |
|
| 49 |
# install prebuilt-only libraries |
| 50 |
- mv tls/libnvidia-tls.so.${PV} . || die # alt tls lib needed by libglx.so |
| 51 |
multilib_foreach_abi nvidia-drivers_libs_install |
| 52 |
|
| 53 |
einstalldocs |
| 54 |
|
| 55 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.143.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild |
| 56 |
similarity index 98% |
| 57 |
rename from x11-drivers/nvidia-drivers/nvidia-drivers-390.143.ebuild |
| 58 |
rename to x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild |
| 59 |
index 9475ceb6d03..3dcee051f4a 100644 |
| 60 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.143.ebuild |
| 61 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild |
| 62 |
@@ -138,6 +138,12 @@ src_prepare() { |
| 63 |
|
| 64 |
default |
| 65 |
|
| 66 |
+ # alternate tls library needed for 390's libglx.so (bug #785289) |
| 67 |
+ mv tls/libnvidia-tls.so.${PV} . || die |
| 68 |
+ if [[ -d 32 ]]; then |
| 69 |
+ mv 32/tls/libnvidia-tls.so.${PV} 32 || die |
| 70 |
+ fi |
| 71 |
+ |
| 72 |
# prevent detection of incomplete kernel DRM support (bug #603818) |
| 73 |
sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \ |
| 74 |
-i kernel/conftest.sh || die |
| 75 |
@@ -337,7 +343,6 @@ src_install() { |
| 76 |
doman nvidia-smi.1 |
| 77 |
|
| 78 |
# install prebuilt-only libraries |
| 79 |
- mv tls/libnvidia-tls.so.${PV} . || die # alt tls lib needed by libglx.so |
| 80 |
multilib_foreach_abi nvidia-drivers_libs_install |
| 81 |
|
| 82 |
einstalldocs |
Archives