public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Thomas Beierlein" <tomjbe@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/puff/
Date: Wed, 30 Jun 2021 18:23:39 +0000 (UTC)	[thread overview]
Message-ID: <1625077404.6ae6627d53481ea1859fd1f071949f062e441a0a.tomjbe@gentoo> (raw)

commit:     6ae6627d53481ea1859fd1f071949f062e441a0a
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 18:23:24 2021 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 18:23:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae6627d

sci-electronics/puff: Do not call gcc directly

Closes: https://bugs.gentoo.org/799269
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 sci-electronics/puff/puff-20100127-r1.ebuild | 5 +++--
 sci-electronics/puff/puff-20181104.ebuild    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-electronics/puff/puff-20100127-r1.ebuild b/sci-electronics/puff/puff-20100127-r1.ebuild
index c13ddfb1131..1c89266a793 100644
--- a/sci-electronics/puff/puff-20100127-r1.ebuild
+++ b/sci-electronics/puff/puff-20100127-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="microwave CAD software"
 HOMEPAGE="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/puff/"
@@ -22,13 +22,14 @@ src_prepare() {
 	# fix lib path for X11 and dont ignore LDFLAGS
 	sed -i  -e "s#lib\\\/#$(get_libdir)\\\/#" \
 		-e 's/CFLAGS/#CFLAGS/' \
+		-e 's/CC =/#CC =/' \
 		-e 's/link.res/.res/g' \
 		-e 's/.res pu/.res $(LDFLAGS) pu/' Makefile || die
 }
 
 src_compile() {
 	LDFLAGS="$(raw-ldflags)"
-	emake -j1
+	emake -j1 CC="$(tc-getCC)"
 }
 
 src_install() {

diff --git a/sci-electronics/puff/puff-20181104.ebuild b/sci-electronics/puff/puff-20181104.ebuild
index 9d07d1e9fd6..bf281406eae 100644
--- a/sci-electronics/puff/puff-20181104.ebuild
+++ b/sci-electronics/puff/puff-20181104.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="microwave CAD software"
 HOMEPAGE="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/puff/"
@@ -21,13 +21,14 @@ src_prepare() {
 	default
 	# fix lib path for X11 and dont ignore LDFLAGS
 	sed -i  -e 's/CFLAGS/#CFLAGS/' \
+		-e 's/CC =/#CC =/' \
 		-e 's/link.res/.res/g' \
 		-e 's/.res pu/.res $(LDFLAGS) pu/' Makefile || die
 }
 
 src_compile() {
 	LDFLAGS="$(raw-ldflags)"
-	emake -j1
+	emake -j1 CC="$(tc-getCC)"
 }
 
 src_install() {


             reply	other threads:[~2021-06-30 18:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-30 18:23 Thomas Beierlein [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-06-15  8:49 [gentoo-commits] repo/gentoo:master commit in: sci-electronics/puff/ Andrew Ammerlaan
2022-11-19 16:59 Thomas Beierlein
2022-11-19 16:59 Thomas Beierlein
2021-06-29 17:12 Thomas Beierlein
2021-06-29 17:12 Thomas Beierlein
2019-04-20  1:29 Aaron Bauman
2018-11-28  0:06 Aaron Bauman
2018-07-22 11:41 Thomas Beierlein

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1625077404.6ae6627d53481ea1859fd1f071949f062e441a0a.tomjbe@gentoo \
    --to=tomjbe@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox