commit: f30bed50f18566190979cde0412e9919b0934a44
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 19:15:32 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 19:15:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30bed50
app-arch/unzip: expand toolchain sed to cover more cases #575710
app-arch/unzip/unzip-6.0-r3.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-arch/unzip/unzip-6.0-r3.ebuild
b/app-arch/unzip/unzip-6.0-r3.ebuild
index 210563b..a1ea761 100644
--- a/app-arch/unzip/unzip-6.0-r3.ebuild
+++ b/app-arch/unzip/unzip-6.0-r3.ebuild
@@ -25,13 +25,13 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/${P}-no-exec-stack.patch
use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
- sed -i \
+ sed -i -r \
-e '/^CFLAGS/d' \
- -e '/CFLAGS/s:-O[0-9]\?:$(CFLAGS) $(CPPFLAGS):' \
+ -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
-e '/^STRIP/s:=.*:=true:' \
- -e "s:\<CC=gcc\>:CC=\"$(tc-getCC)\":" \
- -e "s:\<LD=gcc\>:LD=\"$(tc-getCC)\":" \
- -e "s:\<AS=gcc\>:AS=\"$(tc-getCC)\":" \
+ -e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
+ -e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
+ -e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
-e 's:LF2 = -s:LF2 = :' \
-e 's:LF = :LF = $(LDFLAGS) :' \
-e 's:SL = :SL = $(LDFLAGS) :' \
