From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 28 Feb 2016 19:15:32 +0000 (-0500)
Subject: app-arch/unzip: expand toolchain sed to cover more cases #575710
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f30bed50f18566190979cde0412e9919b0934a44;p=gentoo.git

app-arch/unzip: expand toolchain sed to cover more cases #575710
---

diff --git a/app-arch/unzip/unzip-6.0-r3.ebuild b/app-arch/unzip/unzip-6.0-r3.ebuild
index 210563bcb5a1..a1ea7610becc 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) :' \