From aed27473c455465e20eff60f0b623a6914a1e268 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 22 Oct 2019 11:11:51 +0200 Subject: [PATCH] x11-drivers/nvidia-drivers: Fix conftest.sh locale expectations conftest.sh in 440.* expects to find "$file: No such file or directory" in compile test output for kernel headers, but with LC_ALL set, its translations will not trigger that, resulting in false positives for certain headers where the test intended to rule out false negatives. Fix this by setting the default locale in conftest.sh. Package-Manager: Portage-2.3.77, Repoman-2.3.17 Fixes: https://bugs.gentoo.org/698238 Signed-off-by: Jeroen Roovers --- .../files/nvidia-drivers-440.26-locale.patch | 13 +++++++++++++ .../nvidia-drivers/nvidia-drivers-440.26.ebuild | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch new file mode 100644 index 000000000000..aa2a74349f2f --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch @@ -0,0 +1,13 @@ +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -6,6 +6,10 @@ + SCRIPTDIR=`dirname $0` + cd $SCRIPTDIR + ++# translate_and_compile_header_files() expects the default locale ++# https://bugs.gentoo.org/698238 ++export LC_ALL=C ++ + CC="$1" + ARCH=$2 + ISYSTEM=`$CC -print-file-name=include 2> /dev/null` diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.26.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.26.ebuild index 2e87b035eecb..529819532dc8 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.26.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.26.ebuild @@ -83,6 +83,9 @@ RDEPEND=" " QA_PREBUILT="opt/* usr/lib*" S=${WORKDIR}/ +PATCHES=( + "${FILESDIR}"/${PN}-440.26-locale.patch +) nvidia_drivers_versions_check() { if use amd64 && has_multilib_profile && \ -- 2.26.2