| 1 |
commit: 6ae6627d53481ea1859fd1f071949f062e441a0a |
| 2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 30 18:23:24 2021 +0000 |
| 4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 30 18:23:24 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae6627d |
| 7 |
|
| 8 |
sci-electronics/puff: Do not call gcc directly |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/799269 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 12 |
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> |
| 13 |
|
| 14 |
sci-electronics/puff/puff-20100127-r1.ebuild | 5 +++-- |
| 15 |
sci-electronics/puff/puff-20181104.ebuild | 5 +++-- |
| 16 |
2 files changed, 6 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-electronics/puff/puff-20100127-r1.ebuild b/sci-electronics/puff/puff-20100127-r1.ebuild |
| 19 |
index c13ddfb1131..1c89266a793 100644 |
| 20 |
--- a/sci-electronics/puff/puff-20100127-r1.ebuild |
| 21 |
+++ b/sci-electronics/puff/puff-20100127-r1.ebuild |
| 22 |
@@ -3,7 +3,7 @@ |
| 23 |
|
| 24 |
EAPI=7 |
| 25 |
|
| 26 |
-inherit flag-o-matic |
| 27 |
+inherit flag-o-matic toolchain-funcs |
| 28 |
|
| 29 |
DESCRIPTION="microwave CAD software" |
| 30 |
HOMEPAGE="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/puff/" |
| 31 |
@@ -22,13 +22,14 @@ src_prepare() { |
| 32 |
# fix lib path for X11 and dont ignore LDFLAGS |
| 33 |
sed -i -e "s#lib\\\/#$(get_libdir)\\\/#" \ |
| 34 |
-e 's/CFLAGS/#CFLAGS/' \ |
| 35 |
+ -e 's/CC =/#CC =/' \ |
| 36 |
-e 's/link.res/.res/g' \ |
| 37 |
-e 's/.res pu/.res $(LDFLAGS) pu/' Makefile || die |
| 38 |
} |
| 39 |
|
| 40 |
src_compile() { |
| 41 |
LDFLAGS="$(raw-ldflags)" |
| 42 |
- emake -j1 |
| 43 |
+ emake -j1 CC="$(tc-getCC)" |
| 44 |
} |
| 45 |
|
| 46 |
src_install() { |
| 47 |
|
| 48 |
diff --git a/sci-electronics/puff/puff-20181104.ebuild b/sci-electronics/puff/puff-20181104.ebuild |
| 49 |
index 9d07d1e9fd6..bf281406eae 100644 |
| 50 |
--- a/sci-electronics/puff/puff-20181104.ebuild |
| 51 |
+++ b/sci-electronics/puff/puff-20181104.ebuild |
| 52 |
@@ -3,7 +3,7 @@ |
| 53 |
|
| 54 |
EAPI=7 |
| 55 |
|
| 56 |
-inherit flag-o-matic |
| 57 |
+inherit flag-o-matic toolchain-funcs |
| 58 |
|
| 59 |
DESCRIPTION="microwave CAD software" |
| 60 |
HOMEPAGE="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/puff/" |
| 61 |
@@ -21,13 +21,14 @@ src_prepare() { |
| 62 |
default |
| 63 |
# fix lib path for X11 and dont ignore LDFLAGS |
| 64 |
sed -i -e 's/CFLAGS/#CFLAGS/' \ |
| 65 |
+ -e 's/CC =/#CC =/' \ |
| 66 |
-e 's/link.res/.res/g' \ |
| 67 |
-e 's/.res pu/.res $(LDFLAGS) pu/' Makefile || die |
| 68 |
} |
| 69 |
|
| 70 |
src_compile() { |
| 71 |
LDFLAGS="$(raw-ldflags)" |
| 72 |
- emake -j1 |
| 73 |
+ emake -j1 CC="$(tc-getCC)" |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
Archives