commit: 1896d50ddab8495c4fb1f116799c0fbf6b22a817 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Dec 14 11:45:48 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Dec 14 11:45:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1896d50d
dev-lang/ghc: fix build with autoconf 2.71 Closes: https://bugs.gentoo.org/829162 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/ghc/files/ghc-8.8.4-autoconf-2.71.patch | 22 ++++++++++++++++++++++ dev-lang/ghc/ghc-8.8.4-r1.ebuild | 1 + 2 files changed, 23 insertions(+) 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.angerm...@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!
