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