public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/gappa/
Date: Wed,  9 Jun 2021 14:25:19 +0000 (UTC)	[thread overview]
Message-ID: <1623248716.17f2d67ce495f5dc5a7c904e3a2ace655fb6e117.andrewammerlaan@gentoo> (raw)

commit:     17f2d67ce495f5dc5a7c904e3a2ace655fb6e117
Author:     Lucas Mitrak <lucas <AT> lucasmitrak <DOT> com>
AuthorDate: Tue Jun  8 11:45:57 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun  9 14:25:16 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=17f2d67c

sci-mathematics/gappa: Remove -l or --load-average from ${MAKEOPTS}

* Remove -l or --load-average from ${MAKEOPTS} in src_compile()

Currently, sci-mathematics/gappa will fail to compile if either -l or
--load-average is set in ${MAKEOPTS} because remake does not accept
them. This commit will remove either -l or --load-average from
${MAKEOPTS} during the src_compile() stage in the same method found in
a suggested patch [1] written by developer Lars Wendler in bug
653554 [2]. This will allow the package to compile and install
correctly.
This commit was tested in a docker image with dev-util/ebuildtester.
This commit was written, tested, and submitted by Lucas Mitrak.

[1] https://653554.bugs.gentoo.org/attachment.cgi?id=528056
[2] https://bugs.gentoo.org/653554
Closes: https://bugs.gentoo.org/568368
Signed-off-by: Lucas Mitrak <lucas <AT> lucasmitrak.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-mathematics/gappa/gappa-1.3.5.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sci-mathematics/gappa/gappa-1.3.5.ebuild b/sci-mathematics/gappa/gappa-1.3.5.ebuild
index 26461a439..d7907989d 100644
--- a/sci-mathematics/gappa/gappa-1.3.5.ebuild
+++ b/sci-mathematics/gappa/gappa-1.3.5.ebuild
@@ -28,6 +28,11 @@ src_prepare() {
 }
 
 src_compile() {
+	# Remove --load-average or -l because remake does not accept these
+	echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load\-average)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		MAKEOPTS="${MAKEOPTS/$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load\-average)(=?|[[:space:]]*)[[:digit:]]+')/}"
+	fi
 	./remake -d ${MAKEOPTS} || die "emake failed"
 	if use doc; then
 		./remake doc/html/index.html


             reply	other threads:[~2021-06-09 14:25 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-09 14:25 Andrew Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-01-03 19:09 [gentoo-commits] proj/sci:master commit in: sci-mathematics/gappa/ Andrew Ammerlaan
2021-06-09 14:25 Andrew Ammerlaan
2021-06-09 14:25 Andrew Ammerlaan
2021-03-04 12:09 Andrew Ammerlaan
2021-03-04 12:09 Andrew Ammerlaan
2015-09-21 19:05 Justin Lecher
2014-09-16 17:01 Christoph Junghans
2013-08-12 21:27 Sebastien Fabbro
2013-01-14 14:10 Jonathan-Christofer Demay
2012-02-06 14:31 Jonathan-Christofer Demay
2011-06-25 17:22 Justin Lecher
2011-02-13  8:02 Jonathan-Christofer Demay

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=1623248716.17f2d67ce495f5dc5a7c904e3a2ace655fb6e117.andrewammerlaan@gentoo \
    --to=andrewammerlaan@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