summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-12-14 11:45:48 +0000
committerSam James <sam@gentoo.org>2021-12-14 11:45:48 +0000
commit1896d50ddab8495c4fb1f116799c0fbf6b22a817 (patch)
treec2f91d7d2ad062e3a705929f2b8828dd094c9eae /dev-lang/ghc
parentsys-devel/mold: add live ebuild (diff)
downloadgentoo-1896d50ddab8495c4fb1f116799c0fbf6b22a817.tar.gz
gentoo-1896d50ddab8495c4fb1f116799c0fbf6b22a817.tar.bz2
gentoo-1896d50ddab8495c4fb1f116799c0fbf6b22a817.zip
dev-lang/ghc: fix build with autoconf 2.71
Closes: https://bugs.gentoo.org/829162 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-lang/ghc')
-rw-r--r--dev-lang/ghc/files/ghc-8.8.4-autoconf-2.71.patch22
-rw-r--r--dev-lang/ghc/ghc-8.8.4-r1.ebuild1
2 files changed, 23 insertions, 0 deletions
diff --git a/dev-lang/ghc/files/ghc-8.8.4-autoconf-2.71.patch b/dev-lang/ghc/files/ghc-8.8.4-autoconf-2.71.patch
new file mode 100644
index 000000000000..5de8c6806b79
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-8.8.4-autoconf-2.71.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/829162
+https://gitlab.haskell.org/ghc/ghc/-/issues/19655
+https://gitlab.haskell.org/ghc/ghc/-/commit/ad2ef3a13f1eb000eab8e3d64592373b91a52806
+
+From: Moritz Angermann <moritz.angermann@gmail.com>
+Date: Wed, 17 Feb 2021 21:13:07 +0800
+Subject: [PATCH] [configure] Fix _AC_PROG_CC_99
+
+_AC_PROG_CC_99 isn't available anymore in recent autoconf versions.
+This broke on aarch64-darwin.
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -659,7 +659,7 @@ AC_DEFUN([FP_SET_CFLAGS_C99],
+ CPPFLAGS="$$3"
+ unset ac_cv_prog_cc_c99
+ dnl perform detection
+- _AC_PROG_CC_C99
++ AC_PROG_CC_C99
+ fp_cc_c99="$ac_cv_prog_cc_c99"
+ case "x$ac_cv_prog_cc_c99" in
+ x) ;; # noop
+GitLab
diff --git a/dev-lang/ghc/ghc-8.8.4-r1.ebuild b/dev-lang/ghc/ghc-8.8.4-r1.ebuild
index 6254a54371ae..5803cfac6333 100644
--- a/dev-lang/ghc/ghc-8.8.4-r1.ebuild
+++ b/dev-lang/ghc/ghc-8.8.4-r1.ebuild
@@ -510,6 +510,7 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
eapply "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch
eapply "${FILESDIR}"/${PN}-8.4.2-allow-cross-bootstrap.patch
+ eapply "${FILESDIR}"/${P}-autoconf-2.71.patch
# fixed in 8.8.4. See https://gitlab.haskell.org/ghc/ghc/-/blob/ghc-8.8.4-release/configure.ac#L1273
# eapply "${FILESDIR}"/${PN}-8.6.5-numa.patch
# rumors say this is fixed properly in 8.8.3. Let's check!