commit: 5419a91b0e134275bfdcb321f2eaec35480a94f0
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 14:35:18 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 11:29:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5419a91b
sci-mathematics/gap: fix regeneration of aclocal.m4
Without AC_CONFIG_MACRO_DIRS in configure.ac, running eautoconf clobbers
the important m4_include directives in aclocal.m4, leading to libtool
version errors in the build. A quick "sed" does the trick.
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/gap/gap-4.12.2-r3.ebuild | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/sci-mathematics/gap/gap-4.12.2-r3.ebuild
b/sci-mathematics/gap/gap-4.12.2-r3.ebuild
index ce54b8bfeffb..2ccaded522a5 100644
--- a/sci-mathematics/gap/gap-4.12.2-r3.ebuild
+++ b/sci-mathematics/gap/gap-4.12.2-r3.ebuild
@@ -80,6 +80,14 @@ src_prepare() {
# produces a GNUmakefile.
rm Makefile || die
+ # Prepend AC_CONFIG_MACRO_DIRS to configure.ac so that eautoreconf
+ # recreates aclocal.m4 correctly. Upstream bundles libtool-2.4.6,
+ # and Gentoo uses 2.4.7, so we need to regenerate aclocal.m4. BUT,
+ # upstream also uses m4_include directives in aclocal.m4 rather than
+ # AC_CONFIG_MACRO_DIRS in configure.ac. Without AC_CONFIG_MACRO_DIRS
+ # eautoreconf will omit all of the macros in cnf/m4.
+ sed -e '1s;^;AC_CONFIG_MACRO_DIRS([cnf/m4])\n;' -i configure.ac || die
+
default
# Fix feature detection with pathological CFLAGS
