commit: ef21f83344cc9a064923e058f82d781d13b1987b Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> AuthorDate: Mon Jul 8 16:01:52 2024 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Tue Jul 9 03:08:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef21f833
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 <AT> gentoo.org> Acked-by: Sam James <sam <AT> gentoo.org> app-arch/gzip/{gzip-1.13.ebuild => gzip-1.13-r1.ebuild} | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app-arch/gzip/gzip-1.13.ebuild b/app-arch/gzip/gzip-1.13-r1.ebuild similarity index 93% rename from app-arch/gzip/gzip-1.13.ebuild rename to 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 }
