gentoo resync : 22.12.2021

3 files changed, 25 insertions, 1 deletions

diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index a0880bbc8ce4..40b548cdaac7 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -11,6 +11,7 @@ AUX ghc-8.2.1_rc1-win32-cross-2-hack.patch 6231 BLAKE2B 8ad4428ebe9a373e08e94e53
 AUX ghc-8.4.2-allow-cross-bootstrap.patch 768 BLAKE2B b697a54fde6687d49592398be33ea4feb6404ff24f51b5b82bd71fe8234ad2d0d3322199b12770b23a0fe27ebb5a10eab2400a5c84d28c29f3d8f3d4521cf214 SHA512 1a58408a96d2e35b021f7298b399153973905e6ff8338de8a137c126f0e2598306e0c9cf2925253717c8d7125796094a0490a03947982961f583537b5188fbec
 AUX ghc-8.6.5-numa.patch 850 BLAKE2B bc15c4e24a8a395f5f3540469e5e769285b705fae05790b9d9a76e87490ec1103a89c1b1a0166b05f29f9d6e07b847fba9c9b7ec01e9cb9f3c8aa0078e4caa68 SHA512 89ee983384cfb07211f37ebcc32c74f93d82541c9459857cf317a8c947d4325a9d50caf051cd68fda2c648c0f0305f7df12eef7dfaa86ada79fb5816269f76ce
 AUX ghc-8.8.1-revert-CPP.patch 2236 BLAKE2B f793a9e9516f9f484234311372715116dfdd588a6682113914c17feedc635371779f0c0591e1f0caf3ff3e5ca5d4c7cc8b052045306f3df4085873d0df25f2af SHA512 b324c6873a802e20ee690f0574f9f2f312f3ba4331345504b7170f52ab2b1adeb9d047a0e5526053d006d67fc261e771a284bdb8f7b76653c21d9bf9337d7cf5
+AUX ghc-8.8.4-autoconf-2.71.patch 705 BLAKE2B 8f2de61be130832fafe44d10ee5608a78b3d29dd34942991ebfe722d3792deec6c0e0e5e8ac871a4487c3d1dabf16b4837ce407f08ba49dac33b65d49390dfb9 SHA512 ea74730f3a9346856cb75f661b29268e435734458ab9dede3aeaf828297de376b2aae67ef0d97e63345277cd399036a191ef5c506428804d78801eadc77d905c
 AUX ghc-bash-completion 6496 BLAKE2B dc94a1979e886026a2fbe04bf7b45718ffa3e025a0e8945262e21a1243bfce6517fa1794f2ba6cd54cc853e93ad5d80472b9019b95762f10b5be83634a479955 SHA512 ede79ccf23555f60f48297d29bd98e3ccfd67d2cf27462153e00beb930398cb497e34ba8316e91df44c577ed11fdbe5606f7c6a2777e35d5e783590e49ccfeb5
 DIST ghc-8.10.4-src.tar.xz 19818108 BLAKE2B 069dd8436c373ccf73c20d8b577243792ffdd3a031e869edd612fe1e273126e60803326542695012dbe62e57654ada18af9342bbe1a741b2bebb41cdb0d86035 SHA512 9bb078cb72535a352243b83b671c871392564efd09e478549f27ae58fc6f46e337a0782f5500d26d5704ad96eace22e77bb36031a1fe9b7e175f265b0b9c028b
 DIST ghc-8.10.4-testsuite.tar.xz 2236932 BLAKE2B 17d0520ad5c6daa0cc60530279ae7e617e4d79328b9f436abbe75e72f0803d9a997fb9e1ae61425326b070f45794a488d8507957fec9a6ed49eea86d30a1e579 SHA512 1bf129c8d872e3ceff7c19929605adc5d68daab9ded9aa2e5109b0de162089631472c66f04993adf8481291f8128bf804fe64a9d344c81e257f1b962ba5e382c
@@ -35,6 +36,6 @@ DIST ghc-bin-9.0.1-x86_64-pc-linux-gnu.tbz2 121542968 BLAKE2B 837870e68138f8d97d
 EBUILD ghc-8.10.4-r1.ebuild 26143 BLAKE2B 8476b6ed1671f2b7ba5d1a202eab94299f12804af89e7626917a970a658b63e8988c0f9d38140ed1e823f4574d5230c038610662dd04ab82aefa9f5516cfc59f SHA512 272a8a08096b437bd73eab7a3b38576f1c373f0c21352c340d27516755c5eb1c061806b204948dec0df325819213414d575bdb28c060750714ba16bfdc05e7d1
 EBUILD ghc-8.10.5-r1.ebuild 26077 BLAKE2B c81a9599ec300b0ec3264f1016bd3dfb692a5ccb2f5fe85e4763accf2327179164dc32ca52fefd64ef5cf680426d05a5afef2e2043def5f1b334f70f1c7004d0 SHA512 c84517d16762dd379aec574a4381fd2f5ab895c1ba162618e147f418cdb8439bda1054a9752b72c2c688835e4546f267d581d76b62ea74ffed6144f748ab6626
 EBUILD ghc-8.10.6.ebuild 26102 BLAKE2B 9331e6bb99d4b1a34a6b1e0a95d0d8685780e856f861ead2548fa3b2251b9922694d154ad88e456b3ab4e43e023628a571c705c7397556375486371b4cc2bcab SHA512 1569cfa1937910ccf6cc252dc144010a8853efc3584862c157d64f57233a9d0320e7804cd1f2e62ddd0ebea1f3b4e179c5a7c65ffb64276ae88923b97bab2a67
-EBUILD ghc-8.8.4-r1.ebuild 26732 BLAKE2B 0ce893b3987c17490048c6af365fc783a21c00c54aca09abd9a940dca291dbffb97739cf900dbd3a1ae59c8fbd20ab63194d2295777922451006e827bbe0fdf0 SHA512 0adb531579435c4e73c7132668540a476889c62cf15b1ad20df4235127867ca3a8ed4f3df318f8f79bad044a626133cf559c6f87741ba645c8c0e25b74ff53a7
+EBUILD ghc-8.8.4-r1.ebuild 26780 BLAKE2B f6453602136b404b76d78d66ed9643b1dbd690f6cca52c877f22ea85e0c588ee046e44b8a13b2e8913045fa1fc1698c80f483ac122e8cebf043ebcf52af075d5 SHA512 55b6d541b4661f605424af3aaf9ee41fb0897da16dcaf449926a9e6c5c331b513fa44931346cd4c77079e1cb563662ed3f27ede80764033ce1e884972b857493
 EBUILD ghc-9.0.1-r1.ebuild 26047 BLAKE2B 320a76fcc9f8ccad091535fcea42e630fe7b52483969e05b947c0bb64ffa7561d81ae55fdd9823067e2647321e531bbf12a2a3a679e79f541a1ec6fcadea32be SHA512 a6cac26a91b0eb08862dfea253ae53c7bc36c8eea3a8a46f115fd77e68f13d5c50d480002192fee2b15dcc7ec3becc6e11e3fe3e47dd7d1b77150eb3615304ad
 MISC metadata.xml 878 BLAKE2B 4c5b78fa8dad9e9bf02a03735076171939be552cdb58e3022d66a75c4a7b8e6df363fc6eba192bf3c7ef725e6fff5c9db08deb1920040e535fee81d72e3157b9 SHA512 cd15a92e0d529ac9e8a031d98288de6327adcf48500cdfbef561039fa879b03f9b8c2cdb01835c6d8ade648ff95252f61759f3e471c5033f1153fce43aba3cc7
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!