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
