diff options
| author |   Ionen Wolkens <sudinave@gmail.com> | 2021-04-03 21:02:45 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2021-04-03 21:02:45 +0200 |
| commit | 81d05a05a541e4d9ccb8a9bd765ff9224444f2d0 (patch) | |
| tree | 41de3280792189a4f7de1ae0f5f6598fc86cd9df /x11-drivers | |
| parent | x11-drivers/nvidia-drivers: require _PM with 460.67 for <5.10 kernels (diff) | |
| download | gentoo-81d05a05a541e4d9ccb8a9bd765ff9224444f2d0.tar.gz gentoo-81d05a05a541e4d9ccb8a9bd765ff9224444f2d0.tar.bz2 gentoo-81d05a05a541e4d9ccb8a9bd765ff9224444f2d0.zip | |
x11-drivers/nvidia-drivers: use clearer x86 abi check
May or may not help multilib-portage users a bit (bug #778986),
but note that this isn't really being supported.
390.xx handled slightly differently because of x86 keyword.
Closes: https://bugs.gentoo.org/778986
Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'x11-drivers')
3 files changed, 9 insertions, 9 deletions
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild index bff5e56f68c5..d4e9ad71748c 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild @@ -226,13 +226,13 @@ src_install() { fi local libdir=. - if multilib_is_native_abi; then + if [[ -d 32 && ${ABI} == x86 ]]; then + libdir+=/32 + else libs+=( nvidia-cfg nvidia-wfb ) - else - libdir+=/32 fi local lib soname diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild index a425556ec3c2..8626b1e7821a 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild @@ -219,7 +219,9 @@ src_install() { fi local libdir=. - if multilib_is_native_abi; then + if [[ ${ABI} == x86 ]]; then + libdir+=/32 + else libs+=( nvidia-cbl nvidia-cfg @@ -227,8 +229,6 @@ src_install() { nvoptix ) use amd64 && libs+=( nvidia-ngx ) - else - libdir+=/32 fi local lib soname diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild index 5f88085c1348..d50b8ea65b6c 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild @@ -224,7 +224,9 @@ src_install() { fi local libdir=. - if multilib_is_native_abi; then + if [[ ${ABI} == x86 ]]; then + libdir+=/32 + else libs+=( nvidia-cbl nvidia-cfg @@ -232,8 +234,6 @@ src_install() { nvoptix ) use amd64 && libs+=( nvidia-ngx ) - else - libdir+=/32 fi local lib soname |