From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B91DB1382C5 for ; Sun, 25 Apr 2021 08:51:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A33BBE069C; Sun, 25 Apr 2021 08:51:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFD73E069C for ; Sun, 25 Apr 2021 08:51:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 630983413BD for ; Sun, 25 Apr 2021 08:51:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E52D159C for ; Sun, 25 Apr 2021 08:51:35 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1619340682.68c9089b79a78e3352c7c92e229d141d1ccf60f3.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-390.143.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 68c9089b79a78e3352c7c92e229d141d1ccf60f3 X-VCS-Branch: master Date: Sun, 25 Apr 2021 08:51:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4654124e-db04-4f8d-8fa5-fb4fc22d8fb7 X-Archives-Hash: afde3e99d1af39b4cf5beb5e73922b6a commit: 68c9089b79a78e3352c7c92e229d141d1ccf60f3 Author: Ionen Wolkens gmail com> AuthorDate: Sun Apr 25 08:51:22 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Apr 25 08:51:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c9089b 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 gmail.com> Signed-off-by: David Seifert gentoo.org> ...-drivers-390.141-r1.ebuild => nvidia-drivers-390.141-r2.ebuild} | 7 ++++++- ...dia-drivers-390.143.ebuild => nvidia-drivers-390.143-r1.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 similarity index 98% rename from x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild rename to x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild index 5c16a5b14be..50b08991c3f 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 similarity index 98% rename from x11-drivers/nvidia-drivers/nvidia-drivers-390.143.ebuild rename to x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild index 9475ceb6d03..3dcee051f4a 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