summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@gentoo.org>2024-07-08 12:01:52 -0400
committerEli Schwartz <eschwartz@gentoo.org>2024-07-08 23:08:35 -0400
commitef21f83344cc9a064923e058f82d781d13b1987b (patch)
treeb554e90326d692bf2dba2d71074d59ce87b11b96 /app-arch
parentapp-backup/restic: add 0.16.5 (diff)
downloadgentoo-ef21f83344cc9a064923e058f82d781d13b1987b.tar.gz
gentoo-ef21f83344cc9a064923e058f82d781d13b1987b.tar.bz2
gentoo-ef21f83344cc9a064923e058f82d781d13b1987b.zip
app-arch/gzip: embed canonical path to grep, not the one detected on $PATH
When built on a merged-usr binhost, the zgrep script embedded the merged-usr path to /usr/bin/grep, which did not work. It is available everywhere in /bin. Closes: https://bugs.gentoo.org/935721 Signed-off-by: Eli Schwartz <eschwartz@gentoo.org> Acked-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/gzip/gzip-1.13-r1.ebuild (renamed from app-arch/gzip/gzip-1.13.ebuild)4
1 files changed, 4 insertions, 0 deletions
diff --git a/app-arch/gzip/gzip-1.13.ebuild b/app-arch/gzip/gzip-1.13-r1.ebuild
index a864a1774f32..aec0278bdd82 100644
--- a/app-arch/gzip/gzip-1.13.ebuild
+++ b/app-arch/gzip/gzip-1.13-r1.ebuild
@@ -51,6 +51,10 @@ src_configure() {
# Avoid text relocation in gzip
use pic && export DEFS="NO_ASM"
+ # embeds the path to grep detected at build time into installed scripts;
+ # use the canonical USE="split-usr" agnostic path. bug #935721
+ export GREP="${EPREFIX}/bin/grep"
+
# bug #663928
econf --disable-gcc-warnings
}