diff options
| author |   Ionen Wolkens <sudinave@gmail.com> | 2021-04-25 10:51:22 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2021-04-25 10:51:22 +0200 |
| commit | 68c9089b79a78e3352c7c92e229d141d1ccf60f3 (patch) | |
| tree | 3e864118026e26594754a497d45bd1d219e059d8 /x11-drivers | |
| parent | dev-libs/libtpms: Update maintainer name (diff) | |
| download | gentoo-68c9089b79a78e3352c7c92e229d141d1ccf60f3.tar.gz gentoo-68c9089b79a78e3352c7c92e229d141d1ccf60f3.tar.bz2 gentoo-68c9089b79a78e3352c7c92e229d141d1ccf60f3.zip | |
x11-drivers/nvidia-drivers: prevent 390.xx abi_x86_32 GLX segfault
Regression since 390.141-r1.
Alternate libnvidia-tls.so from the tls/ directory is necessary for
390.xx branch and legacy libglx.so but wasn't used with abi_x86_32.
-d 32 test is for x86 keyword without the directory (wasn't affected).
Closes: https://github.com/gentoo/gentoo/pull/20520
Closes: https://bugs.gentoo.org/785289
Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild) | 7 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-390.143.ebuild) | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild index 5c16a5b14be3..50b08991c3fb 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild @@ -138,6 +138,12 @@ src_prepare() { default + # alternate tls library needed for 390's libglx.so (bug #785289) + mv tls/libnvidia-tls.so.${PV} . || die + if [[ -d 32 ]]; then + mv 32/tls/libnvidia-tls.so.${PV} 32 || die + fi + # prevent detection of incomplete kernel DRM support (bug #603818) sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \ -i kernel/conftest.sh || die @@ -337,7 +343,6 @@ src_install() { doman nvidia-smi.1 # install prebuilt-only libraries - mv tls/libnvidia-tls.so.${PV} . || die # alt tls lib needed by libglx.so multilib_foreach_abi nvidia-drivers_libs_install einstalldocs diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.143.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild index 9475ceb6d034..3dcee051f4a4 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.143.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild @@ -138,6 +138,12 @@ src_prepare() { default + # alternate tls library needed for 390's libglx.so (bug #785289) + mv tls/libnvidia-tls.so.${PV} . || die + if [[ -d 32 ]]; then + mv 32/tls/libnvidia-tls.so.${PV} 32 || die + fi + # prevent detection of incomplete kernel DRM support (bug #603818) sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \ -i kernel/conftest.sh || die @@ -337,7 +343,6 @@ src_install() { doman nvidia-smi.1 # install prebuilt-only libraries - mv tls/libnvidia-tls.so.${PV} . || die # alt tls lib needed by libglx.so multilib_foreach_abi nvidia-drivers_libs_install einstalldocs |