<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e61d02b378a409b5341fb3971a065b21181a09ec">https://github.com/macports/macports-ports/commit/e61d02b378a409b5341fb3971a065b21181a09ec</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e61d02b378a ghc: Update to version 8.10.5
</span>e61d02b378a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e61d02b378a409b5341fb3971a065b21181a09ec
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Mon Jun 7 19:41:37 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> ghc: Update to version 8.10.5
</span>---
lang/ghc/Portfile | 44 +++++++++++----------
lang/ghc/files/keyid-588764fbe22d19c4.txt | 50 ++++++++++++++++++++++++
lang/ghc/files/keyid-97db64ad.txt | 63 -------------------------------
lang/ghc/files/patch-aclocal.m4.diff | 11 ------
lang/ghc/files/patch-gmp-ghc.mk.diff | 12 +++---
5 files changed, 80 insertions(+), 100 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/Portfile b/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8853596b6b8..001fa53871a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,8 @@ PortGroup legacysupport 1.1
</span> legacysupport.newest_darwin_requires_legacy 5
name ghc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.10.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories lang haskell
maintainers {ieee.org:s.t.smith @essandess} openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,13 +49,13 @@ distfiles ${distname}-x86_64-apple-darwin${extract.suffix} \
</span> ${distname}-testsuite${extract.suffix}
checksums ${distname}-x86_64-apple-darwin${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 740e68e1d3f3fe3b74fd8ed7b5e4d57950a37e2a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 725ecf6543e63b81a3581fb8c97afd21a08ae11bc0fa4f8ee25d45f0362ef6d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 193880272 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 38761c8877c634b3ebbcb63cc050813f86b2cfb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ef0f47eff8962d58fa447123636cf8ef31c1e5b2d0ae90177d3388861ddf4a22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 189861780 \
</span> ${distname}-testsuite${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 444b1e05cf95665b47b7fddd99bca0e86df3ca17 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 01cbec3cf5d7e17dcafe98a7645b43205c10d8592e6c0de1f5dcbf0b60a074ca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2236932
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6bf59d799eb36083d10c6f2b0b5a86fcdac03d1f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a69924a8447614bce0137589666e445f61713b65e51e68f546d82c97c939986d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2270504
</span>
gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,13 +66,13 @@ if {[option gpg_verify.use_gpg_verification]} {
</span> ${distname}-testsuite${extract.suffix}.sig
checksums-append \
${distname}-x86_64-apple-darwin${extract.suffix}.sig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 586 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 438 \
</span> ${distname}-testsuite${extract.suffix}.sig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 586
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 438
</span>
post-checksum {
# check GPG signature: https://www.haskell.org/ghc/download_ghc_8_6_5.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set gpg_keyid 97db64ad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gpg_keyid 588764fbe22d19c4
</span>
gpg_verify.verify_gpg_signature \
${filespath}/keyid-${gpg_keyid}.txt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,9 +189,9 @@ if { [variant_isset "prebuilt"] } {
</span> ${distname}-src${extract.suffix}
checksums-append \
${distname}-src${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9b7ab19c21229f0c565c19e851323529c4184f4b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19818108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 be0aee129fc67cf3554200f07329f5a49d1c99c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f10941f16e4fbd98580ab5241b9271bb0851304560c4d5ca127e3b0e20e3076f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19920148
</span>
depends_build-append \
port:alex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,13 +270,20 @@ if { [variant_isset "prebuilt"] } {
</span> ${srcpath}/${distname}/libraries/Cabal/Cabal/doc/conf.py \
${srcpath}/${distname}/docs/users_guide/conf.py \
" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|(\{DejaVu\[\[:alnum:\]_\]*)\[\[:space:\]\]+|\\1|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|(\{DejaVu\[\[:alnum:]_]*)\[\[:space:]]+|\\1|g" \
</span> ${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|(\{DejaVu\[\[:alnum:\]_\]*)\[\[:space:\]\]+|\\1|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|(\{DejaVu\[\[:alnum:]_]*)\[\[:space:]]+|\\1|g" \
</span> ${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|\{(DejaVu\[\[:alnum:\]_\]*)\}|\{\\1.ttf\}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|\{(DejaVu\[\[:alnum:]_]*)\}|\{\\1.ttf\}|g" \
</span> ${f}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gitlab.haskell.org/ghc/ghc/-/issues/19962
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix issue "(unicode error) 'unicodeescape' codec can't decode bytes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # by using a Python raw string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "103s|(^\[\[:space:]]+'preamble':\[\[:space:]]+)(''')|\\1r\\2|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${srcpath}/${distname}/docs/users_guide/conf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "109s|\\\\(\\\\tymin)|\\1|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${srcpath}/${distname}/docs/users_guide/conf.py
</span> # fix python3 executable name
foreach f "\
${srcpath}/${distname}/boot \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,9 +300,6 @@ if { [variant_isset "prebuilt"] } {
</span> CXX=${configure.cxx}
# diff -Naur ghc ghc-patched | sed -E -e 's/ghc(-patched)?\//.\//g' > patch-gmp-ghc.mk.diff
system -W ${srcpath}/${distname} "patch -p0 < ${filespath}/patch-gmp-ghc.mk.diff"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://gitlab.haskell.org/ghc/ghc/-/issues/19655
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # diff -Naur aclocal.m4 aclocal.m4.macports | sed -E -e 's|.macports||' > patch-aclocal.m4.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${srcpath}/${distname} "patch -p0 < ${filespath}/patch-aclocal.m4.diff"
</span>
system -W ${srcpath}/${distname} \
"export ${configure.env} ;\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/files/keyid-588764fbe22d19c4.txt b/lang/ghc/files/keyid-588764fbe22d19c4.txt
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1cd999f0ef9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc/files/keyid-588764fbe22d19c4.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-----BEGIN PGP PUBLIC KEY BLOCK-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Version: SKS 1.1.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Comment: Hostname: sks.pod02.fleetstreetops.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mQGNBGC7eIUBDAC5xWztdYHAHMraJcy555udPgGyw36KOIH0/Sp6mRS5YJCwSp86yNzuJTo/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+zZfZc7oDoQX5c8/tNi9BsDL0f/XEBiYEtfXmSTeN9R0NU/3THjdCz9t9H9bD52l1nOwyawwa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+nIjktfB7qZU97agcMHyl8VVmEH9kCTHTKkGxvDwtL4MHANszZcFQggMvNKE/uxc8CARIdYM1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+G1PxxxnyPrKry461s6Q9tNmiOyxAjv5t72qGHGZhd+jKq31zI+VPuXB1UuMqvQMwhvplHlWE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ZOeazSpt361ryuUHDWdKkiKrzSRDK1JVGsi3Exdioa4HSNQVv3bX4q1pmVneyTPSjF3rge5Q
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+e77ogok1ba92PvJqe6VG+2yDgIbug15mnLspySqc3ukvPUBUyJx5y7i/RY4sbElvvnQfiGwI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+TGEeA81ejOUrbKKDczEI2a2cLNFINn5En4+M2PCkc9tOuRU4PE/fS4qfUWknPn0+rW6PaE/A
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R7aGaqaq11jQQzxX/gZtrU0AEQEAAbQ1WnViaW4gRHVnZ2FsIChHSEMgc2lnbmluZyBrZXkp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+IDx6dWJpbkB3ZWxsLXR5cGVkLmNvbT6JAdQEEwEIAD4WIQSItX/PfbU7TbO/pLFYh2T74i0Z
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xAUCYLt4hQIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBYh2T74i0ZxNTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+C/9sfAWRr8GjI0HtN2dkGtMFCgyM0YNR472wEsquR1g3oabDpFptsKDxcL2V9NFTEReim9Ms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OYcQyJuiszk2KiWfSuPxuPvsTbo3vrk4XX2WC37oX4MT02DPYp40jBF8Vc4jfMLoPkzQD82L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+zpq2qqowc8RWKRY9U+EgfXywmTL3++riGeYkIijjbqipaLDUustMugIyr/SH/6qpBmrKdFYt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+9vAdOWF2yxNTiCTYDTYERX87T4bmTEYvPj1Vl44/flU6tzTSwbXtF8Ns/QL9Rrm+2GoSGfhY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2wHpbeRC2fTB/H3LavkZ9kjO64xjXNmrCHI93jJ4MlSEyJPsVDsrgsTXHhCy5ms69dlpQ+Dn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+3c1DmwIKUzTSdqitXCxEKZV6drbb/ITTwcg+JT1uEv1sTb0WYkoWenJzNtSTiinfcW9GeiYJ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+6OzCFWuC/AstCABJhfXjSNuGwYss2W7ly98gqibL9Rpth+MfcOGwxrrOPLMb4zyGbt9SJYGf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+UsHDq6M6fBSJAjMEEAEIAB0WIQT/63zoHhajaz4t7W8t4E1Ol9tkrQUCYLucswAKCRAt4E1O
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+l9tkrT5WD/99aQ1l1FTrBVCIkixcLWAXdH09YwjwskIS/mRtmr1ogqzXYsyEykyrVoLKhnJx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+G76uw0XV4FVQ9wBX1VSBL/CEAzzeW7BcXM0GWx3Wu6HHYjhi2Y+fW/kTimT5HlAOvHwOhgME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+3kxHdycT/54LXoD1pt4w+27bHpQsyNnu+fX56lrZWZ7NBKT/NWjmWuwqS2/M+jOfxsRDRVDn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+uV91+qQIn3jXxQR1tXzpB116N0pyVv3m/7r5FV05ILYt8oj6tT7RIP9/inSIKcIvyJVuS1hm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+1AM8tJIn1CwqnfINEyPjJB9xPEKBkVxK/Wr76epp9ZHpP/gKMgh+L1La6KqaxxYOYzM+y3Or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xNXfy03ZdIUnXkuYe6sQa6TYEp2JsUPcX9wxrvTjKDIuvhoY5rr8FEor3dn4C/+PCouVFUP1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ZIJvmjD4M9J+nFpYlh1Gc/EHjgTBvSu1iLYiH49hz7VRNoh/fagDTM2CfWTSYBBNJZKIBhfO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sAU82rSQjdJ7/t2FgLx6Knv3OLCNxIdHT2V0JW8p+aCXZvEo5Wl4Oq4ooOhyLjOu97Xlwvqw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+IgbGD6HMvv+d8r6Re5C20mZjO9JKyDKJPlRYy3/pknaAdbNnEW/jED3+BYHojnxyltcFcdOK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+9FrXaOSzNvJ6gk6337SzAHRPTjS+BrqM0lssQxx2PZrVabkBjQRgu3iFAQwAzSB3cV+WaPAn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+8earoZY7hHWebp2hDm264hpItqk5WpctIRfbNL+rLm682+r1xa2rgkWU2JULRkWkFQsuMHTo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+IZzAJsp79/xLb8PHhDo9Wis/rIjH+NBrCVPyPPitLvqnbF5TJYr/AqqgIi2TZox6oEsWWjr1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+e3ZdMO2BoQ16FYT+vl+qvS5sypgL3KOqaxFZx7I14z3Og/etYpW2DKFAa/rBnz/2ABAUuL3a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+YKM2NDKKyio5K/wVF4k1hiTynBRAeOVLUbGj0A8FPw9+LsKu3RVodcpBBEIiMoVYqYMBlkkb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dIpxZoZhu1OuDigiLcBEopyD7eEz5ZEGA6R++sNVJ39/6zAfnh7Wod//Kwssqo0GZyKpqZIE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+iF7PrrAgeSxctEH9lHxcWxY3e5MmSIyijU2iIo22g8YST4cV/el5aZe4EoZN6sFRJUG1lFco
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Yj1owVAOGCL3qUSLWpqaZA7BTLKY+FrWrOXDcQmlzPZSH3NdM+3HYiYq8NkT3Ve/8etjABEB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+AAGJAbwEGAEIACYWIQSItX/PfbU7TbO/pLFYh2T74i0ZxAUCYLt4hQIbDAUJA8JnAAAKCRBY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+h2T74i0ZxJWoDACckdPWFPI6MXEl0tWvZH5joE7z+EEK8JxbUIv7yYwEBUgz0S7VMRWIobmf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+f3vapsG6u8KNS3yPVZrT/8WsVX7ernCQnb7arInV6xNjBTWjniRIszCPZtcbw3grdetfEZJw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mbq8LNstOhPJD/Bl8HSJgDsnCjHDDwWhiatOj+KpdUjqkhUrjFlWlHWlBmBzTA6gWS7mnnwM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mWviyiZzKwSHweXALw1xUXUUMguRPqriMDJtTwzDumaTuFCWVrsK1Hel/+dDSNtt+lZJ0OZ1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+obhIxreayMp/efDZWj5U5ZIa/HHMPD9puFjfPzlJRHdZThBaU01IhTLnETnoOjhrbWEzBz/H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xKMyAryHy7uGg/p5sk3OHBVau5CqFrb4APNM5WG+x/Ibw3e6/qpIl3OGDtAf0wWIfJ1dpBUY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GpfogTCOCFw/5sjsGALzt1QP85DccXzVLcBAl5CcCmb7jNhSXaeFHXoTyu1DxpmlkOgNIjZ9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+aNQ9Du5EPFb38u4D1U7vKio=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+=Hyz8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-----END PGP PUBLIC KEY BLOCK-----
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/files/keyid-97db64ad.txt b/lang/ghc/files/keyid-97db64ad.txt
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a5a237736b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc/files/keyid-97db64ad.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,63 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>------BEGIN PGP PUBLIC KEY BLOCK-----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Version: SKS 1.1.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Comment: Hostname: pgp.mit.edu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mQINBFWvRX0BEACnMXaAVVueyQABaaV7QyrLVeIPqvOHiLCyK/XkIwF3FtJAw2rYQE+p8r+f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OhtOsARQSZlOToEL/8had2qWGigVU/zrGs/dpE1TfrLZtdCfUefg0G3tlYgk4fGPtJrAIjIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PaiGis/NLACsmme9DuffZ8oVG1oJ7xgM/2OhKxmqQQsvJXyXArej2Zd89728ovkN8txlqebb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-U7hkRCIWqLdgogpONREB59waUHYmVkH3onaU2E2At1RgIRHmSBDUx532tr02v31GD5lGGQjD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-lL0uSdFYEQRV15pjGQzaWE9Kxm/IoX4H802eEtzP9OHq0fyNCnwJILhbrN5m0vBrggKN6OEF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MRNiKCLPRhDoI9m/ZvOOi1sCOV5gcJ1YGJKht1znlQGqiHZ3E2LitE/8yrxlcEBU75g4FiZm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ZcjDJXiR92phcBxd+jDVr+y8yNThqVZVVnW3AN7X2ikqf3D3Ca76q5j7kTY9B4FhDNVYyA1c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-0aN9A6N0e672fQMmx1JJoHSXxwSO5Yyne0luwdLHTYHu1WlycjzYwRuAXRI8y/U2TedLBSvf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FwdY6F0e0UDna5BYiwPNppk3WgIZtF0QdPNEfwQtCIjopQ/kPW61EzZtkDFTvJJoG3IT4NwH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-8LJxluVzp1S1I32/odPVdED/wWgdFpar/T/G13DDDk92hYpStQARAQABtCRCZW5qYW1pbiBH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-YW1hcmkgPGJlbkB3ZWxsLXR5cGVkLmNvbT6JARwEEAEIAAYFAlah9iYACgkQc+3p6M+67wEy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cQgAnNrTkmlJYNx0MucA3iRSPqbK7R7Z6FmdJom40BGLzzeNOZYMsCVzaEUSZ+CMIHIm+4Lo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2OfLrYdts0XKz/ehDtazggBGwbZyPg3SP3RtNEv9yBAeeFJr6X3psoxf5n8MSkccxd6boFPW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-empz+hHALhOSozGw4UXiqb8Ls+10FAwL9uGvF3y6JEArCDbZ1fxw/ewG5rg4wS8994rADCAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-iHHhvC9x0A7JmTxnVjnYhbj6p1IWah2k/z5I+/uLubMwTE+na4PJLmVeU5OymPc32hxaGzpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-KkVVaNHuJ9XMOqBLhrsBSQZDHXngbAr83l5j5Pjf13+5871PiCkADhjHi4kCHAQQAQIABgUC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-VfOTXAAKCRAhmhiXQVzoXoV3EACCjbwmR57R/xZGIHu2P5igXetPTPztYxyjj8Se98SnZLs5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-nFiasj4zeGanxgn8WHGsmduPGvHSJ7T6c57HMviX1gtjp/W/oeS9H0n/SPa3ox9lvZIz+2v8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-zTDR3wisr9onrqAt5TFt/zMRQohuthV/6dmSX3p00MCZ+X3gBYWTo/bZqdxUEYhSrJ66zrQo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-6/O3MIxx3qHIndUYyeo3VcwPqb0iAPmlIvAd/zq4NelrgwMcRlhNZmYX2nGewthov7En1wKa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-YedDxY5tJUXQSTaNQFPgY00u6gB3vgbNRv4p+BTftFZSrBqyd7RWutpyGLrBBCTHufexWjex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-wZ/+roG7seCVo0SavNWar7YmcSVFqoc2GAqQGXf0w87QmQfbUAhss4GdlkF4UC4ZSiqVY4sc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-WDJWRYz7vcYxCe3yHEIVyJQ/RUO77DtbinvU9TaXuc0flno0T0ZiGEiI/WBsYuUWpYW2oppi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-79IgsQjsxo0HuH3E8Md4hobStrYD0vJi+ehkKfiNbXNPN+TZ5CQTRAOMbRfrGlQ/1LeT0Pmz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-etXzN13gqaEW/UPQtrAr4BRvEKRjOxBBNFwYeTNDreBJbmTFu+UShvuSYx3eMRN6S37Ulwac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Hp7MDrysv0OjQqv1zAvpTyUZDpv4ch3aFfusm0Dt2bBLQj81ZBnHQoO8u71tkYkCOAQTAQIA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IgUCVa9FfQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQLeBNTpfbZK0OAxAAnGOw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Z1fDFW7k8zVuKFHaKQtKBsSiQjY+MrVv6KQGgR8BP1gjcoTYFRmVlcaLId7lxCCs40Gwv5YZ
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-wdoiWjHa0h7TsilXMpoJbQ7p9Ft/dvqBsVpsDaqYVvs5SiEnOuWXRwqJitPqebC97s0eA1F+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-20cqYbMkk/EUuvWLrzQ3oK1lrCYvZC69iOUJKOZjpgpP5w6IYny1mhSeQ+MS8aGEWNdo/mu2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+zoRY5aeua52G9JkF1gImdAGGiFDYLoO8roQfbAuAVh65hvUPXe8ipnYJj90c+pgv7jawmit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-T6OF0Q0c44+CAPuOVUuiXcQE/msB1RpFA0Eh3Bq0VvP+QA/8j6rX5xzU1Ig0grZXz2Es07BZ
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pA8Sp2e/FrPLocSKwbhygJOaWZ1cgF5YvhBsgvC3Mkd5tv1iegcQcO6tBYOLLUmE/mdGjhu4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-7gWFoe3JzrC2WR27teuLkNtkuhVJV7AzkJbV/mhsz/FMU4MO20mutG4sMVGChHnUfphTcLWH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ZOZfGu+BWfCDE1mq1LsxBkxnvKt2P2EycUmp2TOB+E2p79d8rvleeUDw9/rxbq6HCuxjeqcJ
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/mp1NPOkV+aHqkUdpgR07FrGJdEEDJGP3aBIMWRuHS9tFcRgE6SvJekXO+bs/qxg9msztpnk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-g/EZu7TdHd9RilIgf3/uI5wKw8fBEDG5Ag0EVa9FfQEQALPBspAeQHcFP9h6jN+2Y2XtA0cH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ev2GGtxVm00orwdeK8bfkEix7ffZ3guoCdleY3iV12EXGbxmbmadwuBy4bxkCYKQxG4SDM+l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-4c3+H17GzZl0ogdM/2amFy44RXuJ4vXP1KK0EQHzqh4MaT6RqLhBimn3gFD+aeJMMonud//P
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ahy4gbCN1VDzEfBzukVjPCgrB2aR1Evm5sed9iaM0ocCJAjacliVGQGRuhCVJFmsuFbRzPEX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2A4dDDBGwewgHhyCG4tZ3jeBskWeP6ilm5176/Ak+KGvfaPXe5scEuR7PjKP63QdHf/Bq0a/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GMCoN5p8viHmqaIuMKuuqhKCIsqzXzpIouO20aHXdT+sFwZqOQ/8ZGWfhtGYfig/3bD345h4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-h/b254QSvJOKcXe/PZb7K8+ywe6XhGkfF1KMPlslwh3zCO+rcE70SUp9hh8DBhUcR/LXFSVX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-6u0E9sH1AhC7YWE1iXGA+s05GXxSbuPBiDkm6GUIhreyCYjJu4trp4ZDXH2hyqFAgSm35b60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-7gIjUBoTwaVLe0SPlXC0VgRzR9iP8Xm8SP1FoYWmMAfINp5XpWtD7l85/Wto1AwuLmMNrjZX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-nsxBfBjHInE5ZhQ8kZheXUNfWm37vIZg/ILOzwbYh2F//Q+6IMccRXqP2aElXq7uEvaKhHov
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Z4uWnhfNABEBAAGJAh8EGAECAAkFAlWvRX0CGwwACgkQLeBNTpfbZK3JCQ//Zf3FvvXMidNw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-4WBBldIk1580X9I++777z5+6+qql9PmDRb3tDWCTOOkL/x93HpUFLbc6cB9LHvgdCIWcwbSY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-aw+0RxGvI/cU1M3ufcAUeT5echcXWzFS7KqFJ8DnU5qtEymOSoyfMg0OMFBLzJDcuKbs2uae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-p3qKXCKYo99x7jGZcNAU1ANIM6nXa4aiEfwH+XA/XWILlEaegVhzDXZxTUgqQ6urFA3kHuP9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-o5bUmAFdmIDoqS6F5ghpm1v+awAufOQ40EhukMlTjP6NwJ0r2//P3WwlFyDYMA9xhJKsm4Rk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+hHRNJKxXNh+rHCWzrmjDlS9CtrqPEAIvBa5c1QERKl/+WeJR8jl3toQE6Gh+86C5fOppnvm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FR40kjSYIkrQC4QcpkhzBarTYT4EKjR3xAOxFB+A8H7meR8rIWdM2aLTXBPvNOLw15Qinqpu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-JF3Th3vRnCD1AiqDiL3jFMgARhyikSFnbkW5Dy48arA2pRgq4fwJ66p4q7s+y9LAMy8GxuhO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gjVc/qA05eCEJkYhxJDMSiV3HK//KRkC+WhlIh6Z9B3IH/lbiBKLwDBCgZLCdfuBd8M9bG7E
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/MW+grHCrGkDEgN4W2yqrC2GIyHJYP7OWEMT4zihvSVVeOfd0XFop/5aRHQOMwk+j+ISUsjh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-qKy3vVAoMp1M/4Q4StZ+dfA=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-=18mB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>------END PGP PUBLIC KEY BLOCK-----
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/files/patch-aclocal.m4.diff b/lang/ghc/files/patch-aclocal.m4.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f862bd78ce..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc/files/patch-aclocal.m4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aclocal.m4 2021-04-06 08:29:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aclocal.m4 2021-04-06 08:30:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -653,7 +653,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$$3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset ac_cv_prog_cc_c99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl perform detection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _AC_PROG_CC_C99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_PROG_CC_C99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fp_cc_c99="$ac_cv_prog_cc_c99"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "x$ac_cv_prog_cc_c99" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x) ;; # noop
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/files/patch-gmp-ghc.mk.diff b/lang/ghc/files/patch-gmp-ghc.mk.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fe18abb1f25..aba736a094d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc/files/patch-gmp-ghc.mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc/files/patch-gmp-ghc.mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span> diff -Naur ./libraries/integer-gmp/gmp/ghc.mk ./libraries/integer-gmp/gmp/ghc.mk
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./libraries/integer-gmp/gmp/ghc.mk 2020-09-22 14:03:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libraries/integer-gmp/gmp/ghc.mk 2020-09-22 14:04:35.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,7 +130,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # `./configure`, not `HOSTPLATFORM`: the 'host' on which GMP will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # run is the 'target' platform of the compiler we're building.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libraries/integer-gmp/gmp/ghc.mk 2021-06-07 13:51:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libraries/integer-gmp/gmp/ghc.mk 2021-06-07 13:52:05.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,7 +133,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dependency on ncurses through gmp. readline is only relevant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for gmp test programs. (See gmp's configure)
</span> cd libraries/integer-gmp/gmp/gmpbuild; \
- CC=$(CCX) CXX=$(CCX) NM=$(NM) AR=$(AR_STAGE1) ./configure \
+ NM=$(NM) AR=$(AR_STAGE1) ./configure \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-shared=no --with-pic=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-shared=no --with-pic=yes --with-readline=no \
</span> --host=$(TARGETPLATFORM) --build=$(BUILDPLATFORM)
$(MAKE) -C libraries/integer-gmp/gmp/gmpbuild MAKEFLAGS=
</pre><pre style='margin:0'>
</pre>