Skip to content

Commit cc507eb

Browse files
committed
updpatch: ghc 9.6.6-1
Refresh patch.
1 parent 730ac28 commit cc507eb

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

ghc/riscv64.patch

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
diff --git PKGBUILD PKGBUILD
2-
index c7828b0..24f2c71 100644
2+
index 69700b6..fbb8d55 100644
33
--- PKGBUILD
44
+++ PKGBUILD
5-
@@ -19,17 +19,24 @@ url='https://www.haskell.org/ghc/'
5+
@@ -19,20 +19,23 @@ url='https://www.haskell.org/ghc/'
66
license=('custom')
77
makedepends=('ghc-static' 'perl' 'libxslt' 'docbook-xsl' 'python-sphinx' 'haskell-hadrian'
88
'haskell-hscolour' 'texlive-fontsrecommended' 'texlive-latexextra' 'texlive-xetex'
99
- 'ttf-dejavu' 'alex' 'happy' 'time' 'numactl' 'python-sphinx_rtd_theme')
1010
+ 'ttf-dejavu' 'alex' 'happy' 'time' 'numactl' 'python-sphinx_rtd_theme' 'llvm14')
1111
source=("https://downloads.haskell.org/~ghc/$pkgver/$pkgbase-${pkgver}-src.tar.xz"
12+
"$pkgname-gcc-15.patch::https://gitlab.haskell.org/ghc/ghc/-/commit/f983a00ffc97b779eb52b10e69e254ec107f8311.patch"
1213
- ghc-rebuild-doc-index.hook ghc-register.hook ghc-unregister.hook)
1314
+ ghc-rebuild-doc-index.hook ghc-register.hook ghc-unregister.hook
14-
+ 0001-rts-posix-OSMem-Shrinking-allocation-size-when-it-s-.patch
15-
+ $pkgbase-fix-c-output-for-modern-c-initiative.patch::https://gitlab.haskell.org/ghc/ghc/-/commit/a5a7a0cead6de89648d3a7323c2dc64c59a830fc.patch)
16-
sha512sums=('e5cfb30adc73dc0054f5db2921e5f255c8a980e005798882a2e9daa8df2409ddbe1ec6403e1f6862efc9e4700db4b68d5cae36999d77c7d3fd2fe0ab51cb9923'
15+
+ 0001-rts-posix-OSMem-Shrinking-allocation-size-when-it-s-.patch)
16+
sha512sums=('532bbf5ab44fd4a42abc7904d86ada4803ecbc3cbb499d907520610466b6c2a0c95e07167e8a10c12f3871f3d1d9e54221469ee7a75c3fae1c49b1b281b857ef'
17+
'577f8772652a371e51c185c2d1456584b5ca716df18bc99fa6a8db348c3e0ccd47510792bca5903750d0e40dbbc6cd9b75cffa1fac1434ab2f2d80784b86cb4a'
1718
'd69e5222d1169c4224a2b69a13e57fdd574cb1b5932b15f4bc6c7d269a9658dd87acb1be81f52fbcf3cb64f96978b9943d10cee2c21bff0565aaa93a5d35fcae'
1819
'5f659651d8e562a4dcaae0f821d272d6e9c648b645b1d6ab1af61e4dd690dc5a4b9c6846753b7f935963f001bb1ae1f40cd77731b71ef5a8dbc079a360aa3f8f'
1920
- '3bdbd05c4a2c4fce4adf6802ff99b1088bdfad63da9ebfc470af9e271c3dd796f86fba1cf319d8f4078054d85c6d9e6a01f79994559f24cc77ee1a25724af2e6')
2021
+ '3bdbd05c4a2c4fce4adf6802ff99b1088bdfad63da9ebfc470af9e271c3dd796f86fba1cf319d8f4078054d85c6d9e6a01f79994559f24cc77ee1a25724af2e6'
21-
+ '5000bda406e1c5bf66d29f39b61f2334b197ed631b06792f5547d4249200ceba04c4b809483f2bb7549d5bf876ab2ef885fb688eff084c89822c9d62823c1ca0'
22-
+ 'a85c11a75bcf4c6eca9cae7d850cdab9b6424633ff6744f0a9b233daced5e71a9ecaf30cd6789da0b7b189fd85048365427e636d9f04a3a3097f8532af80d13c')
22+
+ '5000bda406e1c5bf66d29f39b61f2334b197ed631b06792f5547d4249200ceba04c4b809483f2bb7549d5bf876ab2ef885fb688eff084c89822c9d62823c1ca0')
2323

2424
prepare() {
2525
cd ghc-$pkgver
2626

27-
+ patch -p1 < ../0001-rts-posix-OSMem-Shrinking-allocation-size-when-it-s-.patch
28-
+ patch compiler/GHC/HsToCore/Foreign/Decl.hs ../$pkgbase-fix-c-output-for-modern-c-initiative.patch
29-
+
27+
patch -p1 -i ../$pkgname-gcc-15.patch
28+
+ patch -p1 -i ../0001-rts-posix-OSMem-Shrinking-allocation-size-when-it-s-.patch
29+
3030
# devendor rtd-theme for sphinx compatibility
3131
rm -r docs/users_guide/rtd-theme
32-
sed -i 's/rtd-theme/sphinx_rtd_theme/' docs/users_guide/conf.py
33-
@@ -75,7 +82,7 @@ package_ghc-static() {
32+
@@ -79,7 +82,7 @@ package_ghc-static() {
3433

3534
package_ghc() {
3635
pkgdesc='The Glasgow Haskell Compiler'
3736
- depends=('gcc' 'ghc-libs')
3837
+ depends=('gcc' 'ghc-libs' 'llvm14')
39-
provides=('haskell-haddock=2.27.0'
38+
provides=('haskell-haddock=2.29.2'
4039
'haskell-hp2ps=0.1'
4140
'haskell-hpc-bin=0.68'

0 commit comments

Comments
 (0)