community/ghc: upgrade to 8.8.3

3 files changed, 15 insertions, 142 deletions

diff --git a/community/ghc/0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch b/community/ghc/0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch
deleted file mode 100644
index 3ec3dd9c6b..0000000000
--- a/community/ghc/0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 507ceb34bce4bd5cb171987e7447c470195e210b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Lef=C3=A8vre?= <rlefevre@dmy.fr>
-Date: Tue, 10 Dec 2019 00:35:29 +0100
-Subject: testsuite: Add Alpine Linux x64 'stat too good' allocation results
-
----
- testsuite/tests/perf/compiler/all.T   | 4 ++++
- testsuite/tests/perf/haddock/all.T    | 8 +++++++-
- testsuite/tests/perf/should_run/all.T | 3 +++
- 3 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
-index dfb8613d98..1b5e065a55 100644
---- a/testsuite/tests/perf/compiler/all.T
-+++ b/testsuite/tests/perf/compiler/all.T
-@@ -449,6 +449,8 @@ test('T5631',
-         # 2014-04-04:     346389856 (x86 Windows, 64 bit machine)
-         # 2014-12-01:     390199244 (Windows laptop)
-         # 2016-04-06:     570137436 (amd64/Linux) many reasons
-+           (platform('x86_64-alpine-linux'), 1096228616, 5),
-+        # 2019-12-98:     1096228616
-            (wordsize(64), 1161885448, 5)]),
-         # expected value: 774595008 (amd64/Linux):
-         # expected value: 735486328 (amd64/Linux) 2012/12/12:
-@@ -477,6 +479,8 @@ test('parsing001',
-           [(wordsize(32), 232777056, 10),
-         # Initial:        274000576
-         # 2017-03-24:     232777056
-+           (platform('x86_64-alpine-linux'), 426826936, 5),
-+        # 2019-12-09:     426826936
-            (wordsize(64), 519401296, 5)]),
-         # expected value: 587079016 (amd64/Linux)
-         # 2016-09-01:     581551384 (amd64/Linux) Restore w/w limit (#11565)
-diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
-index 1ad98c72ca..237f581d2f 100644
---- a/testsuite/tests/perf/haddock/all.T
-+++ b/testsuite/tests/perf/haddock/all.T
-@@ -10,6 +10,9 @@ test('haddock.base',
-             # 2017-02-19                        24286343184 (x64/Windows) - Generalize kind of (->)
-             # 2017-12-24                        18733710728 (x64/Windows) - Unknown
- 
-+          ,(platform('x86_64-alpine-linux'), 23238935336, 5)
-+            # 2019-12-09   23238935336
-+
-           ,(wordsize(64), 26201242752, 5)
-             # 2012-08-14:  5920822352 (amd64/Linux)
-             # 2012-09-20:  5829972376 (amd64/Linux)
-@@ -79,7 +82,10 @@ test('haddock.Cabal',
-      [extra_files(['../../../../libraries/Cabal/Cabal/dist-install/haddock.t']),
-       unless(in_tree_compiler(), skip), req_haddock
-      ,stats_num_field('bytes allocated',
--          [(wordsize(64), 27520214496, 5)
-+          [(platform('x86_64-alpine-linux'), 25761205904, 5)
-+            # 2019-12-09   25761205904
-+
-+          ,(wordsize(64), 27520214496, 5)
-             # 2012-08-14:  3255435248 (amd64/Linux)
-             # 2012-08-29:  3324606664 (amd64/Linux, new codegen)
-             # 2012-10-08:  3373401360 (amd64/Linux)
-diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
-index fb8137647c..b09e907730 100644
---- a/testsuite/tests/perf/should_run/all.T
-+++ b/testsuite/tests/perf/should_run/all.T
-@@ -465,6 +465,9 @@ test('T9203',
-                       # 2016-04-06     84345136 (i386/Debian) not sure
-                       # 2017-03-24     77969268 (x86/Linux, 64-bit machine) probably join points
- 
-+                      , (platform('x86_64-alpine-linux'), 46371880, 5)
-+                      # 2019-12-08     46371880
-+
-                       , (wordsize(64), 98360576, 5) ]),
-                       # was            95747304
-                       # 2019-09-10     94547280 post-AMP cleanup
--- 
-2.17.1
-
diff --git a/community/ghc/0002-testsuite-Increase-tolerance-for-failed-stat-tests-o.patch b/community/ghc/0002-testsuite-Increase-tolerance-for-failed-stat-tests-o.patch
deleted file mode 100644
index 7238b3bc39..0000000000
--- a/community/ghc/0002-testsuite-Increase-tolerance-for-failed-stat-tests-o.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 296269a1c33b13bba462440b6e10f8b48ec117d2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Lef=C3=A8vre?= <rlefevre@dmy.fr>
-Date: Tue, 10 Dec 2019 15:48:53 +0100
-Subject: testsuite: Increase tolerance for failed stat tests on Alpine
-
----
- testsuite/tests/perf/compiler/all.T    | 2 ++
- testsuite/tests/perf/space_leaks/all.T | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
-index dfb8613d98..f281abe950 100644
---- a/testsuite/tests/perf/compiler/all.T
-+++ b/testsuite/tests/perf/compiler/all.T
-@@ -1281,6 +1281,8 @@ test ('T9630',
-       [ compiler_stats_num_field('max_bytes_used', # Note [residency]
-           [(platform('x86_64-unknown-mingw32'),   39867088, 15),
-           # 2017-12-24:                     34171816 (x64/Windows)
-+          (platform('x86_64-alpine-linux'),  35324712, 25),
-+          # 2019-12-10   43119024 on Alpine at +22%, should likely be investigated
-           (wordsize(64), 35324712, 15)
-           # initial:    56955240
-           # 2017-06-07: 41568168     Stop the specialiser generating loopy code
-diff --git a/testsuite/tests/perf/space_leaks/all.T b/testsuite/tests/perf/space_leaks/all.T
-index a23796d532..4e4bae337b 100644
---- a/testsuite/tests/perf/space_leaks/all.T
-+++ b/testsuite/tests/perf/space_leaks/all.T
-@@ -72,7 +72,7 @@ test('T4029',
-             # 2017-03-03: 65 (amd64/Linux)           Share Typeable KindReps or more
-             #                                        lazy interface file reading
-       stats_num_field('max_bytes_used',
--          [(wordsize(64), 18208944, 15)]),
-+          [(wordsize(64), 18208944, 20)]),
-             # 2016-02-26: 24071720 (amd64/Linux)     INITIAL
-             # 2016-04-21: 25542832 (amd64/Linux)
-             # 2016-05-23: 25247216 (amd64/Linux)     Use -G1
-@@ -90,6 +90,7 @@ test('T4029',
-             # 2017-03-07: 20476360 (amd64/Linux)     It's not entirely clear
-             # 2017-03-14: 18208944 (amd64/Darwin)    Again, not clear
-             # 2017-03-15: bumped margin to 15% due to instability
-+            # 2019-12-10: bumped margin to 20% due to instability on Alpine
-       extra_hc_opts('+RTS -G1 -RTS' ),
-       ],
-      ghci_script,
--- 
-2.17.1
-
diff --git a/community/ghc/APKBUILD b/community/ghc/APKBUILD
index 61c5edf826..aee3b0d220 100644
--- a/community/ghc/APKBUILD
+++ b/community/ghc/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Mitch Tishmack <mitch.tishmack@gmail.com>
 pkgname=ghc
-pkgver=8.6.5
-_llvmver=9
-pkgrel=5
+pkgver=8.8.3
+_llvmver=10
+pkgrel=0
 # Normal non rc candidate
 _urlprefix="$pkgver"
 _pkgprefix="$pkgname-$pkgver"
@@ -37,19 +37,17 @@ checkdepends="python3"
 provides="$pkgname-bootstrap=$pkgver-r$pkgrel"
 subpackages="$pkgname-doc $pkgname-dev"
 install="$pkgname.post-install"
-options="!strip !check"  # we strip it manually in build()
+options="!strip"  # we strip it manually in build()
 source="https://downloads.haskell.org/~ghc/$_urlprefix/$_pkgprefix-src.tar.xz
 	https://downloads.haskell.org/~ghc/$_urlprefix/$_pkgprefix-testsuite.tar.xz
 	0005-buildpath-abi-stability.patch
 	fix-testsuite.patch
-        0001-testsuite-unset-MAKEFLAGS-when-calling-python.patch
-        0001-testsuite-Fix-T8602-on-musl.patch
-        0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch
-        0001-testsuite-Ensure-that-ffi005-output-order-is-predict.patch
-        0001-testsuite-Ensure-T5423-flushes-C-output-buffer.patch
-        0001-testsuite-Skip-broken-tests-on-Alpine.patch
-        0002-testsuite-Increase-tolerance-for-failed-stat-tests-o.patch
-        0001-testsuite-T12600-avoid-broken-pipe-on-Alpine.patch
+	0001-testsuite-unset-MAKEFLAGS-when-calling-python.patch
+	0001-testsuite-Fix-T8602-on-musl.patch
+	0001-testsuite-Ensure-that-ffi005-output-order-is-predict.patch
+	0001-testsuite-Ensure-T5423-flushes-C-output-buffer.patch
+	0001-testsuite-Skip-broken-tests-on-Alpine.patch
+	0001-testsuite-T12600-avoid-broken-pipe-on-Alpine.patch
 	"
 
 # We only need the bootstrap patch when bootstrapping a new arches ghc.
@@ -57,7 +55,6 @@ if [ "$CBUILD" != "$CTARGET" ]; then
 	source="$source 0000-bootstrap.patch"
 fi
 
-
 prepare() {
 	default_prepare
 
@@ -123,7 +120,7 @@ build() {
 
 check() {
 	cd "$builddir/testsuite"
-	make fast THREADS=$JOBS
+	make fast SKIP_PERF_TESTS=YES THREADS=$JOBS
 }
 
 doc() {
@@ -136,7 +133,7 @@ package() {
 	local ghclib="usr/lib/ghc-$pkgver"
 	local newpath path target
 
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 
 	cd "$pkgdir"
 
@@ -189,15 +186,14 @@ dev() {
 	echo "$pfiles" | cpio -pamVd "$subpkgdir"
 	echo "$pfiles" | xargs rm -fr
 }
-sha512sums="c08a7480200cb99e1ffbe4ce7669f552b1054054966f7e7efcbc5f98af8032e1249fa391c4fc4c7d62cc8e0be5d17fa05845177f3cea3dbcf86e6c92d40fc0f9  ghc-8.6.5-src.tar.xz
-980f3934bb18876cc80b80a0eb64a9ca1dfaa7f4d8b0761f5d733a6583053e38b231445388b992b26ec1ad5f569b6385dbe60f96381794f5577964979c253e16  ghc-8.6.5-testsuite.tar.xz
+
+sha512sums="7db0d820a288e56bd32935cc03584295900605f6e7cac6fe6adcb3ec6c24d8d2cebf7a8efa421f2d2fa192602d7f24dfad1ddeeba252455e4cb8baa9889dcaa9  ghc-8.8.3-src.tar.xz
+4ebf3eabcd7591762dfcf45716b06293fb14c00b51307f7788c90dcf4e01f67e6bbb7a887b74d8d30272919486441ac236b42a54c4874aac69d90391b76f81c9  ghc-8.8.3-testsuite.tar.xz
 e1c2cef06d307eda4b35521204e95eb54ace5dbcd22de659e95356f884b4424d6304365e4ab45c5116192cba4c095e2e91114bc7cb73d7c7173a7035287d0854  0005-buildpath-abi-stability.patch
 6be1706f430883ff71bcbf18c2d17add6f54b6c4eaf902f519bb7c553acc8922f7eb718eda0a5ec8a108c91eb66da1471b45c4a03b71f2019b6dc16b27c3b8bb  fix-testsuite.patch
 ac2ad793b4d33ea890e236820af4cd10996b47d0f4249c825b31450145cb8195c2be62f2d7942cc3bf564f768dca187379196b251f4b37ed326ed2a0a5f59e8a  0001-testsuite-unset-MAKEFLAGS-when-calling-python.patch
 3e955b3e025e7dc6521c8545107c747506cdf40aef55210cbc0b0a7adc8a1ac1b5206f2766dd13dbb114c7fb943e439864774422928f7a4ad10484a5e80ac09c  0001-testsuite-Fix-T8602-on-musl.patch
-226b15077c5fb44af8e9076236982c494e18bdc9425c6dd3d9b16d4d72062ce567144479ee8c4b052b9b931af6ae304f6918705e1b66ac9bf699df61ffce4ada  0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch
 cc552b3d01b8d1a31d7a609dc5c82dc7d602a14f427a2594abfdd5c1d6e92d6cf47aafd9cc46e84e2c678e040039b98c673f3dc88efa809f221e75110850f60a  0001-testsuite-Ensure-that-ffi005-output-order-is-predict.patch
 6be53550fee8e59b63355a1f4ce6ef0a5fdc545008a7808a50cb1d0c1b5219e4b2c215f21ae0e2f953486e88dc7c5f1d193b01190553405e620fa3ac9dd31a61  0001-testsuite-Ensure-T5423-flushes-C-output-buffer.patch
 328433df26351acfe67c61c14a365d6b942c7d9d51bfbe099e9f6e26f147a78f3ce5be350df2e896bd179c27b80e0b2a98e0fb8a7590920edca866ed7dc22a39  0001-testsuite-Skip-broken-tests-on-Alpine.patch
-23934d13e5d9daf33338105e525d8daee0b0c1a5614f2042690c26efd46a0ab672041d80658bf06e7fcdb97255c471950af708d5bf8c96dbe9571eed0bef60c5  0002-testsuite-Increase-tolerance-for-failed-stat-tests-o.patch
 b71bb7945c6cae3ea324ff1de9576b883f0e63169fbe50d781acc0f4fb694387c43bf7aa1bd1cca236613ff202dd503c4577dc06368614752affdc54a5c62101  0001-testsuite-T12600-avoid-broken-pipe-on-Alpine.patch"