diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2024-01-14 09:35:18 -0500 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2024-01-22 06:29:20 -0500 |
| commit | 5419a91b0e134275bfdcb321f2eaec35480a94f0 (patch) | |
| tree | 3c5793498b2e47e804887958b028421201e45437 /sci-mathematics | |
| parent | sci-mathematics/gap: drop USE=emacs (a no-op) (diff) | |
| download | gentoo-5419a91b0e134275bfdcb321f2eaec35480a94f0.tar.gz gentoo-5419a91b0e134275bfdcb321f2eaec35480a94f0.tar.bz2 gentoo-5419a91b0e134275bfdcb321f2eaec35480a94f0.zip | |
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@gentoo.org>
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/gap/gap-4.12.2-r3.ebuild | 8 |
1 files changed, 8 insertions, 0 deletions
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 |