diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2018-03-11 18:24:58 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2018-03-11 18:36:27 -0400 |
| commit | a64fc681cba91934c0ebb96fc7c2312fbcb5cef4 (patch) | |
| tree | eddf6fde53ed9b30cff35375ef3a1ddef83f58b5 | |
| parent | profiles: add hardened selinux musl profile for amd64 (diff) | |
| download | gentoo-a64fc681cba91934c0ebb96fc7c2312fbcb5cef4.tar.gz gentoo-a64fc681cba91934c0ebb96fc7c2312fbcb5cef4.tar.bz2 gentoo-a64fc681cba91934c0ebb96fc7c2312fbcb5cef4.zip | |
sys-apps/sed: update bootstrap logic #650052
The bootstrap.sh logic was deleted upstream a while back. Switch to
using busybox's sed as a fallback as needed. This should be good
enough for most cases, and we can figure out something more if the
need comes up.
Bug: https://bugs.gentoo.org/650052
| -rw-r--r-- | sys-apps/sed/sed-4.2.2.ebuild | 10 | ||||
| -rw-r--r-- | sys-apps/sed/sed-4.3-r1.ebuild | 10 | ||||
| -rw-r--r-- | sys-apps/sed/sed-4.4-r1.ebuild | 10 | ||||
| -rw-r--r-- | sys-apps/sed/sed-4.4.ebuild | 10 |
4 files changed, 16 insertions, 24 deletions
diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild index ad3f071a2b1b..b6da5a256ce2 100644 --- a/sys-apps/sed/sed-4.2.2.ebuild +++ b/sys-apps/sed/sed-4.2.2.ebuild @@ -22,13 +22,11 @@ DEPEND="${RDEPEND} src_bootstrap_sed() { # make sure system-sed works #40786 - export NO_SYS_SED="" if ! type -p sed > /dev/null ; then - NO_SYS_SED="!!!" - ./bootstrap.sh || die "couldnt bootstrap" - cp sed/sed "${T}"/ || die "couldnt copy" - export PATH="${PATH}:${T}" - make clean || die "couldnt clean" + mkdir -p "${T}/bootstrap" + printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die + chmod a+rx "${T}/bootstrap/sed" + PATH="${T}/bootstrap:${PATH}" fi } diff --git a/sys-apps/sed/sed-4.3-r1.ebuild b/sys-apps/sed/sed-4.3-r1.ebuild index b0be9297fb01..e70a45187922 100644 --- a/sys-apps/sed/sed-4.3-r1.ebuild +++ b/sys-apps/sed/sed-4.3-r1.ebuild @@ -26,13 +26,11 @@ PATCHES=( src_bootstrap_sed() { # make sure system-sed works #40786 - export NO_SYS_SED="" if ! type -p sed > /dev/null ; then - NO_SYS_SED="!!!" - ./bootstrap.sh || die "couldnt bootstrap" - cp sed/sed "${T}"/ || die "couldnt copy" - export PATH="${PATH}:${T}" - make clean || die "couldnt clean" + mkdir -p "${T}/bootstrap" + printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die + chmod a+rx "${T}/bootstrap/sed" + PATH="${T}/bootstrap:${PATH}" fi } diff --git a/sys-apps/sed/sed-4.4-r1.ebuild b/sys-apps/sed/sed-4.4-r1.ebuild index 26c3858da53b..194b1b193692 100644 --- a/sys-apps/sed/sed-4.4-r1.ebuild +++ b/sys-apps/sed/sed-4.4-r1.ebuild @@ -22,13 +22,11 @@ DEPEND="${RDEPEND} src_bootstrap_sed() { # make sure system-sed works #40786 - export NO_SYS_SED="" if ! type -p sed > /dev/null ; then - NO_SYS_SED="!!!" - ./bootstrap.sh || die "couldnt bootstrap" - cp sed/sed "${T}"/ || die "couldnt copy" - export PATH="${PATH}:${T}" - emake clean + mkdir -p "${T}/bootstrap" + printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die + chmod a+rx "${T}/bootstrap/sed" + PATH="${T}/bootstrap:${PATH}" fi } diff --git a/sys-apps/sed/sed-4.4.ebuild b/sys-apps/sed/sed-4.4.ebuild index aa52e2921cdc..3bdb8e28ac20 100644 --- a/sys-apps/sed/sed-4.4.ebuild +++ b/sys-apps/sed/sed-4.4.ebuild @@ -25,13 +25,11 @@ DEPEND="${RDEPEND} src_bootstrap_sed() { # make sure system-sed works #40786 - export NO_SYS_SED="" if ! type -p sed > /dev/null ; then - NO_SYS_SED="!!!" - ./bootstrap.sh || die "couldnt bootstrap" - cp sed/sed "${T}"/ || die "couldnt copy" - export PATH="${PATH}:${T}" - make clean || die "couldnt clean" + mkdir -p "${T}/bootstrap" + printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die + chmod a+rx "${T}/bootstrap/sed" + PATH="${T}/bootstrap:${PATH}" fi } |