Skip to content

Commit 6b55c4c

Browse files
GZGavinZhaoGZGavinZhao
authored
ghc: Update to v9.8.4 (#6960)
**Summary** - Update to newer GHC for latest version of `pandoc-crossref` - Depends on getsolus/ypkg#128 for haskell macros compatibility Release notes: - [9.6.*](https://downloads.haskell.org/ghc/9.6.7/docs/users_guide/release-notes.html) - [9.8.*](https://downloads.haskell.org/ghc/9.8.4/docs/users_guide/release-notes.html) **Test Plan** - Rebuild reverse-dependencies - Verify that `pandoc` and `pandoc-crossref` work as expected **Checklist** - [x] Package was built and tested against unstable - [ ] This change could gainfully be listed in the weekly sync notes once merged <!-- Write an appropriate message in the Summary section, then add the "Topic: Sync Notes" label -->
2 parents fa304a3 + c0b1181 commit 6b55c4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+431814
-403954
lines changed

‎packages/g/ghc/abi_libs‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
libHSCabal-3.8.1.0-ghc9.4.8.so
2-
libHSCabal-syntax-3.8.1.0-ghc9.4.8.so
3-
libHSarray-0.5.4.0-ghc9.4.8.so
4-
libHSbase-4.17.2.1-ghc9.4.8.so
5-
libHSbinary-0.8.9.1-ghc9.4.8.so
6-
libHSbytestring-0.11.5.3-ghc9.4.8.so
7-
libHScontainers-0.6.7-ghc9.4.8.so
8-
libHSdeepseq-1.4.8.0-ghc9.4.8.so
9-
libHSdirectory-1.3.7.1-ghc9.4.8.so
10-
libHSexceptions-0.10.5-ghc9.4.8.so
11-
libHSfilepath-1.4.2.2-ghc9.4.8.so
12-
libHSghc-9.4.8-ghc9.4.8.so
13-
libHSghc-bignum-1.3-ghc9.4.8.so
14-
libHSghc-boot-9.4.8-ghc9.4.8.so
15-
libHSghc-boot-th-9.4.8-ghc9.4.8.so
16-
libHSghc-compact-0.1.0.0-ghc9.4.8.so
17-
libHSghc-heap-9.4.8-ghc9.4.8.so
18-
libHSghc-prim-0.9.1-ghc9.4.8.so
19-
libHSghci-9.4.8-ghc9.4.8.so
20-
libHShaskeline-0.8.2-ghc9.4.8.so
21-
libHShpc-0.6.1.0-ghc9.4.8.so
22-
libHSinteger-gmp-1.1-ghc9.4.8.so
23-
libHSlibiserv-9.4.8-ghc9.4.8.so
24-
libHSmtl-2.2.2-ghc9.4.8.so
25-
libHSparsec-3.1.16.1-ghc9.4.8.so
26-
libHSpretty-1.1.3.6-ghc9.4.8.so
27-
libHSprocess-1.6.18.0-ghc9.4.8.so
28-
libHSrts-1.0.2-ghc9.4.8.so
29-
libHSrts-1.0.2_debug-ghc9.4.8.so
30-
libHSrts-1.0.2_thr-ghc9.4.8.so
31-
libHSrts-1.0.2_thr_debug-ghc9.4.8.so
32-
libHSstm-2.5.1.0-ghc9.4.8.so
33-
libHStemplate-haskell-2.19.0.0-ghc9.4.8.so
34-
libHSterminfo-0.4.1.5-ghc9.4.8.so
35-
libHStext-2.0.2-ghc9.4.8.so
36-
libHStime-1.12.2-ghc9.4.8.so
37-
libHStransformers-0.5.6.2-ghc9.4.8.so
38-
libHSunix-2.7.3-ghc9.4.8.so
39-
libHSxhtml-3000.2.2.1-ghc9.4.8.so
1+
libHSCabal-3.10.3.0-inplace-ghc9.8.4.so
2+
libHSCabal-syntax-3.10.3.0-inplace-ghc9.8.4.so
3+
libHSarray-0.5.8.0-inplace-ghc9.8.4.so
4+
libHSbase-4.19.2.0-inplace-ghc9.8.4.so
5+
libHSbinary-0.8.9.1-inplace-ghc9.8.4.so
6+
libHSbytestring-0.12.1.0-inplace-ghc9.8.4.so
7+
libHScontainers-0.6.8-inplace-ghc9.8.4.so
8+
libHSdeepseq-1.5.1.0-inplace-ghc9.8.4.so
9+
libHSdirectory-1.3.8.5-inplace-ghc9.8.4.so
10+
libHSexceptions-0.10.7-inplace-ghc9.8.4.so
11+
libHSfilepath-1.4.301.0-inplace-ghc9.8.4.so
12+
libHSghc-9.8.4-inplace-ghc9.8.4.so
13+
libHSghc-bignum-1.3-inplace-ghc9.8.4.so
14+
libHSghc-boot-9.8.4-inplace-ghc9.8.4.so
15+
libHSghc-boot-th-9.8.4-inplace-ghc9.8.4.so
16+
libHSghc-compact-0.1.0.0-inplace-ghc9.8.4.so
17+
libHSghc-heap-9.8.4-inplace-ghc9.8.4.so
18+
libHSghc-prim-0.11.0-inplace-ghc9.8.4.so
19+
libHSghci-9.8.4-inplace-ghc9.8.4.so
20+
libHShaskeline-0.8.2.1-inplace-ghc9.8.4.so
21+
libHShpc-0.7.0.0-inplace-ghc9.8.4.so
22+
libHSinteger-gmp-1.1-inplace-ghc9.8.4.so
23+
libHSmtl-2.3.1-inplace-ghc9.8.4.so
24+
libHSparsec-3.1.17.0-inplace-ghc9.8.4.so
25+
libHSpretty-1.1.3.6-inplace-ghc9.8.4.so
26+
libHSprocess-1.6.25.0-inplace-ghc9.8.4.so
27+
libHSrts-1.0.2-ghc9.8.4.so
28+
libHSrts-1.0.2_debug-ghc9.8.4.so
29+
libHSrts-1.0.2_thr-ghc9.8.4.so
30+
libHSrts-1.0.2_thr_debug-ghc9.8.4.so
31+
libHSsemaphore-compat-1.0.0-inplace-ghc9.8.4.so
32+
libHSstm-2.5.3.1-inplace-ghc9.8.4.so
33+
libHStemplate-haskell-2.21.0.0-inplace-ghc9.8.4.so
34+
libHSterminfo-0.4.1.6-inplace-ghc9.8.4.so
35+
libHStext-2.1.1-inplace-ghc9.8.4.so
36+
libHStime-1.12.2-inplace-ghc9.8.4.so
37+
libHStransformers-0.6.1.0-inplace-ghc9.8.4.so
38+
libHSunix-2.8.6.0-inplace-ghc9.8.4.so
39+
libHSxhtml-3000.2.2.1-inplace-ghc9.8.4.so

‎packages/g/ghc/abi_symbols‎

Lines changed: 370293 additions & 342091 deletions
Large diffs are not rendered by default.

‎packages/g/ghc/abi_used_symbols‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ libc.so.6:__ctype_b_loc
44
libc.so.6:__cxa_atexit
55
libc.so.6:__environ
66
libc.so.6:__errno_location
7+
libc.so.6:__isoc23_sscanf
78
libc.so.6:__isoc23_strtol
89
libc.so.6:__isoc23_strtoull
910
libc.so.6:__libc_start_main
10-
libc.so.6:__progname
1111
libc.so.6:__stack_chk_fail
1212
libc.so.6:_exit
1313
libc.so.6:abort
@@ -61,6 +61,7 @@ libc.so.6:fclose
6161
libc.so.6:fcntl
6262
libc.so.6:fcntl64
6363
libc.so.6:fdatasync
64+
libc.so.6:fdopendir
6465
libc.so.6:feof
6566
libc.so.6:fflush
6667
libc.so.6:fgets
@@ -142,6 +143,7 @@ libc.so.6:newlocale
142143
libc.so.6:nice
143144
libc.so.6:nl_langinfo
144145
libc.so.6:open
146+
libc.so.6:openat
145147
libc.so.6:opendir
146148
libc.so.6:openpty
147149
libc.so.6:pathconf
@@ -152,6 +154,7 @@ libc.so.6:poll
152154
libc.so.6:posix_fadvise
153155
libc.so.6:posix_fallocate
154156
libc.so.6:posix_memalign
157+
libc.so.6:posix_spawn_file_actions_addchdir_np
155158
libc.so.6:posix_spawn_file_actions_addclose
156159
libc.so.6:posix_spawn_file_actions_adddup2
157160
libc.so.6:posix_spawn_file_actions_addopen
@@ -163,7 +166,6 @@ libc.so.6:posix_spawnattr_setflags
163166
libc.so.6:posix_spawnattr_setsigdefault
164167
libc.so.6:posix_spawnp
165168
libc.so.6:printf
166-
libc.so.6:program_invocation_short_name
167169
libc.so.6:pthread_attr_destroy
168170
libc.so.6:pthread_attr_getstacksize
169171
libc.so.6:pthread_attr_init
@@ -253,6 +255,7 @@ libc.so.6:snprintf
253255
libc.so.6:sprintf
254256
libc.so.6:stat
255257
libc.so.6:stat64
258+
libc.so.6:statx
256259
libc.so.6:stderr
257260
libc.so.6:stdin
258261
libc.so.6:stdout
@@ -366,6 +369,8 @@ libm.so.6:exp
366369
libm.so.6:expf
367370
libm.so.6:expm1
368371
libm.so.6:expm1f
372+
libm.so.6:fma
373+
libm.so.6:fmaf
369374
libm.so.6:ldexp
370375
libm.so.6:log
371376
libm.so.6:log1p

‎packages/g/ghc/files/0002-fix-unused-containers-include.patch‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
From 2bc0c36754f086d0b65a39a558e1391b0ac67ffa Mon Sep 17 00:00:00 2001
2+
From: Matthew Pickering <[email protected]>
3+
Date: Mon, 24 Jul 2023 09:59:32 +0100
4+
Subject: [PATCH] compiler: Remove unused `containers.h` include
5+
6+
Fixes #23712
7+
---
8+
compiler/GHC/Data/Word64Map.hs | 1 -
9+
compiler/GHC/Data/Word64Map/Internal.hs | 1 -
10+
compiler/GHC/Data/Word64Map/Lazy.hs | 1 -
11+
compiler/GHC/Data/Word64Map/Strict.hs | 2 --
12+
compiler/GHC/Data/Word64Map/Strict/Internal.hs | 2 --
13+
compiler/GHC/Data/Word64Set.hs | 2 --
14+
compiler/GHC/Data/Word64Set/Internal.hs | 2 --
15+
compiler/GHC/Utils/Containers/Internal/BitUtil.hs | 2 --
16+
compiler/GHC/Utils/Containers/Internal/StrictPair.hs | 2 --
17+
9 files changed, 15 deletions(-)
18+
19+
diff --git a/compiler/GHC/Data/Word64Map.hs b/compiler/GHC/Data/Word64Map.hs
20+
index 3893313b5e9e..b5034ca9f528 100644
21+
--- a/compiler/GHC/Data/Word64Map.hs
22+
+++ b/compiler/GHC/Data/Word64Map.hs
23+
@@ -8,7 +8,6 @@
24+
{-# LANGUAGE MonoLocalBinds #-}
25+
#endif
26+
27+
-#include "containers.h"
28+
29+
-----------------------------------------------------------------------------
30+
-- |
31+
diff --git a/compiler/GHC/Data/Word64Map/Internal.hs b/compiler/GHC/Data/Word64Map/Internal.hs
32+
index 6e60b7f5464a..9dd92fb9efdd 100644
33+
--- a/compiler/GHC/Data/Word64Map/Internal.hs
34+
+++ b/compiler/GHC/Data/Word64Map/Internal.hs
35+
@@ -14,7 +14,6 @@
36+
{-# OPTIONS_HADDOCK not-home #-}
37+
{-# OPTIONS_GHC -fno-warn-incomplete-uni-patterns #-}
38+
39+
-#include "containers.h"
40+
41+
-----------------------------------------------------------------------------
42+
-- |
43+
diff --git a/compiler/GHC/Data/Word64Map/Lazy.hs b/compiler/GHC/Data/Word64Map/Lazy.hs
44+
index 0df84842e2a7..0c09f62937f4 100644
45+
--- a/compiler/GHC/Data/Word64Map/Lazy.hs
46+
+++ b/compiler/GHC/Data/Word64Map/Lazy.hs
47+
@@ -3,7 +3,6 @@
48+
{-# LANGUAGE Safe #-}
49+
#endif
50+
51+
-#include "containers.h"
52+
53+
-----------------------------------------------------------------------------
54+
-- |
55+
diff --git a/compiler/GHC/Data/Word64Map/Strict.hs b/compiler/GHC/Data/Word64Map/Strict.hs
56+
index 4de68d7f7c39..ab7c1471fba7 100644
57+
--- a/compiler/GHC/Data/Word64Map/Strict.hs
58+
+++ b/compiler/GHC/Data/Word64Map/Strict.hs
59+
@@ -4,8 +4,6 @@
60+
{-# LANGUAGE Trustworthy #-}
61+
#endif
62+
63+
-#include "containers.h"
64+
-
65+
-----------------------------------------------------------------------------
66+
-- |
67+
-- Module : Data.Word64Map.Strict
68+
diff --git a/compiler/GHC/Data/Word64Map/Strict/Internal.hs b/compiler/GHC/Data/Word64Map/Strict/Internal.hs
69+
index 1605565c9fd7..d998e6b6a977 100644
70+
--- a/compiler/GHC/Data/Word64Map/Strict/Internal.hs
71+
+++ b/compiler/GHC/Data/Word64Map/Strict/Internal.hs
72+
@@ -4,8 +4,6 @@
73+
74+
{-# OPTIONS_GHC -fno-warn-incomplete-uni-patterns #-}
75+
76+
-#include "containers.h"
77+
-
78+
-----------------------------------------------------------------------------
79+
-- |
80+
-- Module : Data.Word64Map.Strict.Internal
81+
diff --git a/compiler/GHC/Data/Word64Set.hs b/compiler/GHC/Data/Word64Set.hs
82+
index 81cfcbd4efba..3c5c047d948e 100644
83+
--- a/compiler/GHC/Data/Word64Set.hs
84+
+++ b/compiler/GHC/Data/Word64Set.hs
85+
@@ -3,8 +3,6 @@
86+
{-# LANGUAGE Safe #-}
87+
#endif
88+
89+
-#include "containers.h"
90+
-
91+
-----------------------------------------------------------------------------
92+
-- |
93+
-- Module : Data.Word64Set
94+
diff --git a/compiler/GHC/Data/Word64Set/Internal.hs b/compiler/GHC/Data/Word64Set/Internal.hs
95+
index b2df095adfb1..569c312840a4 100644
96+
--- a/compiler/GHC/Data/Word64Set/Internal.hs
97+
+++ b/compiler/GHC/Data/Word64Set/Internal.hs
98+
@@ -12,8 +12,6 @@
99+
100+
{-# OPTIONS_HADDOCK not-home #-}
101+
102+
-#include "containers.h"
103+
-
104+
-----------------------------------------------------------------------------
105+
-- |
106+
-- Module : Data.Word64Set.Internal
107+
diff --git a/compiler/GHC/Utils/Containers/Internal/BitUtil.hs b/compiler/GHC/Utils/Containers/Internal/BitUtil.hs
108+
index b7484cfc2e07..3d938b64e434 100644
109+
--- a/compiler/GHC/Utils/Containers/Internal/BitUtil.hs
110+
+++ b/compiler/GHC/Utils/Containers/Internal/BitUtil.hs
111+
@@ -6,8 +6,6 @@
112+
{-# LANGUAGE Safe #-}
113+
#endif
114+
115+
-#include "containers.h"
116+
-
117+
-----------------------------------------------------------------------------
118+
-- |
119+
-- Module : Utils.Containers.Internal.BitUtil
120+
diff --git a/compiler/GHC/Utils/Containers/Internal/StrictPair.hs b/compiler/GHC/Utils/Containers/Internal/StrictPair.hs
121+
index 65d3780ef071..9a2cf89ca205 100644
122+
--- a/compiler/GHC/Utils/Containers/Internal/StrictPair.hs
123+
+++ b/compiler/GHC/Utils/Containers/Internal/StrictPair.hs
124+
@@ -3,8 +3,6 @@
125+
{-# LANGUAGE Safe #-}
126+
#endif
127+
128+
-#include "containers.h"
129+
-
130+
-- | A strict pair
131+
132+
module GHC.Utils.Containers.Internal.StrictPair (StrictPair(..), toPair) where
133+
--
134+
GitLab
135+
136+

‎packages/g/ghc/package.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name : ghc
2-
version : 9.4.8
3-
release : 15
2+
version : 9.8.4
3+
release : 16
44
source :
5-
- https://downloads.haskell.org/~ghc/9.4.8/ghc-9.4.8-src.tar.xz : 0bf407eb67fe3e3c24b0f4c8dea8cb63e07f63ca0f76cf2058565143507ab85e
6-
- https://downloads.haskell.org/~ghc/9.4.8/ghc-9.4.8-testsuite.tar.xz : ac45dd44b097707a2717058ab2cfff22777ec0f31bfa3f54bf60e18b2dd63c95
5+
- https://downloads.haskell.org/~ghc/9.8.4/ghc-9.8.4-src.tar.xz : 17e8188f3c8a5c2f73fb4e35d01032e8dc258835ec876d52c8ad8ee3d24b2fc5
6+
- https://downloads.haskell.org/~ghc/9.8.4/ghc-9.8.4-testsuite.tar.xz : 4be7906515fc3db6b7c4f85d6e29601accb9153801595fdef1e4ac500a3fd066
77
homepage : https://www.haskell.org/ghc/
88
license : BSD-3-Clause
99
component : programming.haskell
@@ -20,20 +20,17 @@ rundeps :
2020
- ncurses-devel
2121
environment: |
2222
unset LD_PRELOAD
23-
export BUILD_ROOT=~/.cache/hadrian
2423
hadrian () {
25-
./hadrian/build --docs=none --skip-perf --build-root=$BUILD_ROOT %JOBS% $@
24+
./hadrian/build --docs=none --skip-perf %JOBS% $@
2625
}
2726
setup : |
2827
tar xvf $sources/ghc-$version-testsuite.tar.xz --strip 1
2928
3029
%patch -p1 -i $pkgfiles/0001-fix-gcc15-c23-error.patch
30+
%patch -p1 -i $pkgfiles/0002-fix-unused-containers-include.patch
3131
3232
cabal v2-update
3333
34-
mkdir -p $BUILD_ROOT
35-
rm -f $BUILD_ROOT/hadrian.settings
36-
3734
./boot.source
3835
%configure --host=x86_64-unknown-linux \
3936
--target=x86_64-unknown-linux \
@@ -43,7 +40,7 @@ setup : |
4340
build : |
4441
hadrian binary-dist-dir --docs=no-sphinx --docs=no-haddocks --flavour=perf --prefix=/usr
4542
install : |
46-
pushd $BUILD_ROOT/bindist/ghc-%version%-x86_64-unknown-linux/
43+
pushd $workdir/_build/bindist/ghc-%version%-x86_64-unknown-linux/
4744
%configure --host=x86_64-unknown-linux \
4845
--target=x86_64-unknown-linux \
4946
--build=x86_64-unknown-linux \

0 commit comments

Comments
 (0)