public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sed/
Date: Sun, 11 Mar 2018 22:37:56 +0000 (UTC)	[thread overview]
Message-ID: <1520807787.a64fc681cba91934c0ebb96fc7c2312fbcb5cef4.vapier@gentoo> (raw)

commit:     a64fc681cba91934c0ebb96fc7c2312fbcb5cef4
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 22:24:58 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 22:36:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64fc681

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

 sys-apps/sed/sed-4.2.2.ebuild  | 10 ++++------
 sys-apps/sed/sed-4.3-r1.ebuild | 10 ++++------
 sys-apps/sed/sed-4.4-r1.ebuild | 10 ++++------
 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 ad3f071a2b1..b6da5a256ce 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 b0be9297fb0..e70a4518792 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 26c3858da53..194b1b19369 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 aa52e2921cd..3bdb8e28ac2 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
 }
 


             reply	other threads:[~2018-03-11 22:38 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-11 22:37 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-29 21:05 [gentoo-commits] repo/gentoo:master commit in: sys-apps/sed/ Sam James
2024-05-19 16:02 Sam James
2023-05-15  4:10 Sam James
2023-05-15  4:10 Sam James
2022-12-28  0:38 Sam James
2022-12-11 18:01 Arthur Zamarin
2022-12-10  4:48 Sam James
2022-12-10  4:19 Sam James
2022-12-10  4:17 Sam James
2022-12-10  4:17 Sam James
2022-12-10  4:17 Sam James
2022-12-10  4:17 Sam James
2022-12-10  4:17 Sam James
2022-11-07  2:57 Sam James
2022-10-30 15:51 Sam James
2022-09-21  4:21 Sam James
2022-04-07  3:57 Sam James
2022-01-06  9:07 David Seifert
2021-05-14 22:14 David Seifert
2021-04-21 19:02 Sam James
2020-06-11 22:08 Mart Raudsepp
2020-06-11 18:01 Sergei Trofimovich
2020-06-11  8:34 Agostino Sarubbo
2020-06-11  8:31 Agostino Sarubbo
2020-06-11  8:29 Agostino Sarubbo
2020-06-11  8:27 Agostino Sarubbo
2020-06-11  8:25 Agostino Sarubbo
2020-06-10 13:01 Agostino Sarubbo
2020-06-10 13:00 Agostino Sarubbo
2020-05-25 15:54 Mike Gilbert
2020-05-04 17:36 Thomas Deutschmann
2020-04-21  7:44 Lars Wendler
2020-03-21 20:16 Lars Wendler
2020-03-17 10:17 Mart Raudsepp
2020-02-12 16:14 Agostino Sarubbo
2020-01-27 11:22 Mikle Kolyada
2020-01-18  9:54 Sergei Trofimovich
2020-01-17 18:43 Mike Gilbert
2020-01-17 16:02 Mike Gilbert
2020-01-17  8:09 Sergei Trofimovich
2020-01-17  8:07 Sergei Trofimovich
2020-01-16  9:24 Lars Wendler
2020-01-15 23:52 Sergei Trofimovich
2020-01-15  9:17 Agostino Sarubbo
2020-01-15  7:30 Lars Wendler
2019-05-03 23:45 Mikle Kolyada
2018-12-22 13:24 Lars Wendler
2018-12-20 14:13 Mikle Kolyada
2018-07-11 21:35 Mikle Kolyada
2018-06-27  7:25 Tobias Klausmann
2018-06-24 20:25 Sergei Trofimovich
2018-06-23 14:59 Mart Raudsepp
2018-06-23  8:24 Sergei Trofimovich
2018-06-22  7:20 Mikle Kolyada
2018-06-19 19:13 Sergei Trofimovich
2018-06-19 12:55 Thomas Deutschmann
2018-06-19  8:17 Sergei Trofimovich
2018-04-01 14:13 Lars Wendler
2018-04-01 14:13 Lars Wendler
2018-03-11 22:37 Mike Frysinger
2018-03-05 18:37 Mike Frysinger
2017-02-04 13:41 Lars Wendler
2017-01-04 16:49 Lars Wendler
2016-12-07  8:32 Mike Frysinger
2016-09-23 17:40 Tobias Klausmann
2016-08-06 11:11 Markus Meier
2016-07-24 13:09 Jeroen Roovers
2016-07-24 10:22 Jeroen Roovers
2016-06-10  7:20 Benda XU

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1520807787.a64fc681cba91934c0ebb96fc7c2312fbcb5cef4.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox