diff options
| author | Eli Schwartz <eschwartz@gentoo.org> | 2025-06-08 11:28:42 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@gentoo.org> | 2025-06-08 12:32:49 -0400 |
| commit | c4d6bd8fc2cc8a5d7bd6d53cd05cff30a60d2ba1 (patch) | |
| tree | dd53304da13784473c64363bddab08aacd4f9cfd /sys-devel/patch | |
| parent | 62ad53b3d09a6378da6e7d8d6b29aa3e51b6dae4 (diff) | |
| download | gentoo-c4d6bd8fc2cc8a5d7bd6d53cd05cff30a60d2ba1.tar.gz gentoo-c4d6bd8fc2cc8a5d7bd6d53cd05cff30a60d2ba1.tar.bz2 gentoo-c4d6bd8fc2cc8a5d7bd6d53cd05cff30a60d2ba1.zip | |
sys-devel/patch: fix incorrect reliance on split-usr
It hardcodes a compile-time path to `ed`. This is known and handled
already because ${ED} is part of portage and does not point to `ed`. But
the "fix" was to do a $PATH lookup, which in turn broke binpackage
hosting (and profile migration, likely).
The package doesn't have USE=split-usr and we shouldn't add one just for
this. Make sure the portable API filename is used.
Bug: https://bugs.gentoo.org/470210
Closes: https://bugs.gentoo.org/957593
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
Diffstat (limited to 'sys-devel/patch')
| -rw-r--r-- | sys-devel/patch/patch-2.7.6-r8.ebuild (renamed from sys-devel/patch/patch-2.7.6-r7.ebuild) | 5 | ||||
| -rw-r--r-- | sys-devel/patch/patch-2.8-r1.ebuild (renamed from sys-devel/patch/patch-2.8.ebuild) | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys-devel/patch/patch-2.7.6-r7.ebuild b/sys-devel/patch/patch-2.7.6-r8.ebuild index 5086678d2663..6ecba54d4ddd 100644 --- a/sys-devel/patch/patch-2.7.6-r7.ebuild +++ b/sys-devel/patch/patch-2.7.6-r8.ebuild @@ -68,8 +68,9 @@ src_configure() { # rename to gpatch for better BSD compatibility --program-prefix=g ) - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ + # Do not let $ED or $PATH (split-usr) mess up the search for `ed`: + # bug 470210 / bug 957593 + ac_cv_path_ED="${EPREFIX}/bin/ed" \ econf "${myeconfargs[@]}" } diff --git a/sys-devel/patch/patch-2.8.ebuild b/sys-devel/patch/patch-2.8-r1.ebuild index 2eceb5f47355..30b3eb9f3a66 100644 --- a/sys-devel/patch/patch-2.8.ebuild +++ b/sys-devel/patch/patch-2.8-r1.ebuild @@ -58,8 +58,9 @@ src_configure() { # rename to gpatch for better BSD compatibility --program-prefix=g ) - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ + # Do not let $ED or $PATH (split-usr) mess up the search for `ed`: + # bug 470210 / bug 957593 + ac_cv_path_ED="${EPREFIX}/bin/ed" \ econf "${myeconfargs[@]}" } |