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 210563bcb5a19886e8575b70c4ec500bbfffcdac..a1ea7610becc2fc350a991a8188244b1c2a4299f 100644 (file)
--- 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) :' \