From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/
Date: Sun, 05 Jan 2025 14:03:50 +0000 (UTC) [thread overview]
Message-ID: <1736085732.13ffdf4047a68a930f6acd9e07d002aa17b390ef.mjo@gentoo> (raw)
commit: 13ffdf4047a68a930f6acd9e07d002aa17b390ef
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 5 13:16:10 2025 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 14:02:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ffdf40
sci-mathematics/giac: fix hard-coded g++
Add a patch to delete a rule in src/Makefile.am. If we delete the rule,
it does the right thing on its own.
Closes: https://bugs.gentoo.org/947000
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../giac/files/giac-1.9.0.995-dont-call-g++.patch | 29 ++++++++++++++++++++++
sci-mathematics/giac/giac-1.9.0.995-r2.ebuild | 3 ++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/giac/files/giac-1.9.0.995-dont-call-g++.patch b/sci-mathematics/giac/files/giac-1.9.0.995-dont-call-g++.patch
new file mode 100644
index 000000000000..d97be3b39002
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.995-dont-call-g++.patch
@@ -0,0 +1,29 @@
+From 7328ad0895add9acb91f28312c80770530c8be52 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 5 Jan 2025 08:13:35 -0500
+Subject: [PATCH] src/Makefile.am: delete mkjs rule
+
+There's a custom rule to build mkjs from mkjs.cc, and it hard-codes
+the compiler name (g++). But since building an executable from C++
+source is built-in to Make, we can just delete the rule to fix it.
+---
+ src/Makefile.am | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7524632..a6c4767 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -70,9 +70,6 @@ js.c: mkjs qjscalcjs.js xcasjs.js
+ js.h: mkjs qjscalcjs.js xcasjs.js
+ ./mkjs
+
+-mkjs: mkjs.cc
+- g++ mkjs.cc -o mkjs
+-
+ AM_CPPFLAGS = -DIN_GIAC -I$(srcdir) -I$(top_srcdir) -I$(builddir) \
+ -I$(top_builddir) $(GMP_CFLAGS) $(NTL_CFLAGS) \
+ $(COCOA_CFLAGS) $(PARI_CFLAGS)
+--
+2.45.2
+
diff --git a/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild b/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild
index a0a875aadaa6..b0958f787c0a 100644
--- a/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.9.0.67-system-gl2ps.patch"
"${FILESDIR}/${P}-glibcxx-assertions.patch"
"${FILESDIR}/${P}-fix-undefined-behavior.patch"
+ "${FILESDIR}/${P}-dont-call-g++.patch"
)
REQUIRED_USE="test? ( gui )"
next reply other threads:[~2025-01-05 14:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-05 14:03 Michael Orlitzky [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-16 14:22 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/ Michael Orlitzky
2024-09-06 0:35 Michael Orlitzky
2024-03-04 16:33 Michael Orlitzky
2023-10-31 12:59 Michael Orlitzky
2023-07-07 13:18 Michael Orlitzky
2023-06-22 22:17 Michael Orlitzky
2022-12-24 0:03 Michael Orlitzky
2021-06-15 14:32 Michael Orlitzky
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=1736085732.13ffdf4047a68a930f6acd9e07d002aa17b390ef.mjo@gentoo \
--to=mjo@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