openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to ghc-9.6.5.

Browse Source 
ok gnezdo@
This commit is contained in:
kili
2024-04-19 18:53:44 +00:00
parent ab173faec9
commit 39179968a2
5 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/ghc/Makefile
+7 -8
View File
@@ -13,8 +13,7 @@ USE_NOEXECONLY = Yes
USE_NOBTCFI = Yes
GHC_VERSION = 9.6.4
REVISION = 2
GHC_VERSION = 9.6.5
DISTNAME = ghc-${GHC_VERSION}
CATEGORIES = lang devel
HOMEPAGE = https://www.haskell.org/ghc/
@@ -67,17 +66,17 @@ EXTRACT_ONLY = ${DISTFILES} ${DISTFILES.boot}
# Substvars for all libraries, assuming that ghc-boot, ghc-boot-th,
# ghc-heap and ghci will always have the same version number as ghc.
GHC_ITEMS = \
CABAL 3.10.1.0 \
CABAL 3.10.3.0 \
ARRAY 0.5.6.0 \
BASE 4.18.2.0 \
BASE 4.18.2.1 \
BINARY 0.8.9.1 \
BYTESTRING 0.11.5.3 \
CONTAINERS 0.6.7 \
DEEPSEQ 1.4.8.1 \
DIRECTORY 1.3.8.1 \
DIRECTORY 1.3.8.4 \
EXCEPTIONS 0.10.7 \
FILEPATH 1.4.200.1 \
GHC 9.6.4 \
FILEPATH 1.4.300.1 \
GHC 9.6.5 \
GHC_BIGNUM 1.3 \
GHC_COMPACT 0.1.0.0 \
GHC_PRIM 0.10.0 \
@@ -87,7 +86,7 @@ GHC_ITEMS = \
MTL 2.3.1 \
PARSEC 3.1.16.1 \
PRETTY 1.1.3.6 \
PROCESS 1.6.17.0 \
PROCESS 1.6.19.0 \
RTS 1.0.2 \
STM 2.5.1.0 \
TEMPLATE-HASKELL 2.20.0.0 \
lang/ghc/distinfo
+4 -4
View File
@@ -1,10 +1,10 @@
SHA256 (ghc/ghc-9.6.4-src.tar.xz) = EL8luLBxdP3ZhotcDFbBfA7x7ctiR7S4ZL6TNlG/1MA=
SHA256 (ghc/ghc-9.6.4-testsuite.tar.xz) = bhMoL76//b+gpJiJQ3REyakM/ldgxHlpzUJFhUwzjXM=
SHA256 (ghc/ghc-9.6.4.20240321-amd64.tar.xz) = a1/iD2L9THJMIVFDrJBfXl55Vz2y4o2T/38Mq/Y6pZo=
SHA256 (ghc/ghc-9.6.4.20240321-shlibs-amd64.tar.gz) = mM60+ad3IKYSgsD7L9B0HwN9SQA/WAZ6jrhFvZpNL7Q=
SHA256 (ghc/ghc-9.6.5-src.tar.xz) = h7OJkk+YwaJsIFEidXM4yNqzOtH89nD6oiYidCQyuTw=
SHA256 (ghc/ghc-9.6.5-testsuite.tar.xz) = 3KPfSJdc95F9tOP/YhLpR4zkgzfLGhPjAHo9GoAJokw=
SHA256 (ghc/hadrian-sources-9.6.4.20240321.tar.gz) = b+9fiwdVJn0b1UAqYIdsRsqSGsBgDMoTlhxaskS3K7A=
SIZE (ghc/ghc-9.6.4-src.tar.xz) = 29451856
SIZE (ghc/ghc-9.6.4-testsuite.tar.xz) = 7075820
SIZE (ghc/ghc-9.6.4.20240321-amd64.tar.xz) = 74806504
SIZE (ghc/ghc-9.6.4.20240321-shlibs-amd64.tar.gz) = 3548043
SIZE (ghc/ghc-9.6.5-src.tar.xz) = 29463284
SIZE (ghc/ghc-9.6.5-testsuite.tar.xz) = 7081340
SIZE (ghc/hadrian-sources-9.6.4.20240321.tar.gz) = 2125372
lang/ghc/patches/patch-hadrian_hadrian_cabal
+1 -1
View File
@@ -3,7 +3,7 @@ Avoid -qg incompatible with 9.2 runtime
Index: hadrian/hadrian.cabal
--- hadrian/hadrian.cabal.orig
+++ hadrian/hadrian.cabal
@@ -175,7 +175,7 @@ executable hadrian
@@ -176,7 +176,7 @@ executable hadrian
-- waiting for external processes
-- * -qg: Don't use parallel GC as the synchronization
-- time tends to eat any benefit.
lang/ghc/patches/patch-libraries_process_tests_all_T
-12
View File
@@ -1,12 +0,0 @@
Disable a test fixed in the next version:
https://github.com/haskell/process/issues/266
Index: libraries/process/tests/all.T
--- libraries/process/tests/all.T.orig
+++ libraries/process/tests/all.T
@@ -50,4 +50,4 @@ test('process011',
compile_and_run, [''])
test('T8343', js_broken(22349), compile_and_run, [''])
-test('processT251', js_broken(22349), compile_and_run, [''])
+test('processT251', [when(opsys('openbsd'), skip), js_broken(22349)], compile_and_run, [''])
lang/ghc/patches/patch-testsuite_driver_testlib_py
+3 -3
View File
@@ -1,7 +1,7 @@
Index: testsuite/driver/testlib.py
--- testsuite/driver/testlib.py.orig
+++ testsuite/driver/testlib.py
@@ -2146,6 +2146,11 @@ def compare_outputs(way: WayName,
@@ -2149,6 +2149,11 @@ def compare_outputs(way: WayName,
actual_raw = read_no_crs(actual_path)
actual_str = normaliser(actual_raw)
@@ -13,7 +13,7 @@ Index: testsuite/driver/testlib.py
# See Note [Output comparison].
if whitespace_normaliser(expected_str) == whitespace_normaliser(actual_str):
return True
@@ -2162,7 +2167,7 @@ def compare_outputs(way: WayName,
@@ -2165,7 +2170,7 @@ def compare_outputs(way: WayName,
if config.verbose >= 1 and _expect_pass(way):
# See Note [Output comparison].
@@ -22,7 +22,7 @@ Index: testsuite/driver/testlib.py
actual_normalised_path),
stdout=diff_file,
print_output=True)
@@ -2170,7 +2175,7 @@ def compare_outputs(way: WayName,
@@ -2173,7 +2178,7 @@ def compare_outputs(way: WayName,
# If for some reason there were no non-whitespace differences,
# then do a full diff
if r == 0: