diff options
| author | Josselin Poiret <dev@jpoiret.xyz> | 2024-01-15 23:05:37 +0100 |
|---|---|---|
| committer | Josselin Poiret <dev@jpoiret.xyz> | 2024-01-17 12:06:15 +0100 |
| commit | dcb6555b9d5f302b7468d586ebbcffcdde3097c9 (patch) | |
| tree | 2b55e0947693dc594f724409990a7601213ff288 /gnu/packages/haskell.scm | |
| parent | b8345399e066419c141d4b46bb257f9d63bebe3b (diff) | |
gnu: ghc: Fix build with binutils ≥ 2.39.
ld warns about exec stack now, making some tests fail. Fix them (and also
remove an unwarranted exec stack from libHSrts along with it).
* gnu/packages/patches/ghc-9-StgCRunAsm-only-when-needed.patch
* gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch: New patches.
* gnu/local.mk (dist_patch_DATA): Register them.
* gnu/packages/haskell.scm (ghc-8.6, ghc-8.8, ghc-8.10, ghc-9.0, ghc-9.2,
ghc-9.4): Use them.
Change-Id: I8e5fc71d7394527d44ff37b1f9bd59d4971ec010
Diffstat (limited to 'gnu/packages/haskell.scm')
| -rw-r--r-- | gnu/packages/haskell.scm | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3547c20acb..f17012619e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1078,7 +1078,8 @@ interactive environment for the functional language Haskell.") "https://www.haskell.org/ghc/dist/" version "/" name "-" version "-testsuite.tar.xz")) (patches (search-patches "ghc-testsuite-dlopen-pie.patch" - "ghc-testsuite-grep-compat.patch")) + "ghc-testsuite-grep-compat.patch" + "ghc-testsuite-recomp015-execstack.patch")) (sha256 (base32 "0pw9r91g2np3i806g2f4f8z4jfdd7mx226cmdizk4swa7av1qf91")) @@ -1160,7 +1161,8 @@ interactive environment for the functional language Haskell.") "https://www.haskell.org/ghc/dist/" version "/ghc-" version "-testsuite.tar.xz")) (patches (search-patches "ghc-testsuite-dlopen-pie.patch" - "ghc-testsuite-grep-compat.patch")) + "ghc-testsuite-grep-compat.patch" + "ghc-testsuite-recomp015-execstack.patch")) (sha256 (base32 "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z")) @@ -1219,7 +1221,8 @@ interactive environment for the functional language Haskell.") "https://www.haskell.org/ghc/dist/" version "/ghc-" version "-testsuite.tar.xz")) (patches (search-patches "ghc-testsuite-dlopen-pie.patch" - "ghc-testsuite-grep-compat.patch")) + "ghc-testsuite-grep-compat.patch" + "ghc-testsuite-recomp015-execstack.patch")) (sha256 (base32 "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz")) @@ -1302,7 +1305,8 @@ interactive environment for the functional language Haskell.") "/ghc-" version "-src.tar.xz")) (sha256 (base32 - "15wii8can2r3dcl6jjmd50h2jvn7rlmn05zb74d2scj6cfwl43hl")))) + "15wii8can2r3dcl6jjmd50h2jvn7rlmn05zb74d2scj6cfwl43hl")) + (patches (search-patches "ghc-9-StgCRunAsm-only-when-needed.patch")))) (native-inputs `(;; GHC 9.0.2 must be built with GHC >= 8.8 ("ghc-bootstrap" ,ghc-8.10) @@ -1315,7 +1319,8 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "1m5fzhr4gjn9ni8gxx7ag3fkbw1rspjzgv39mnfb0nkm5mw70v3s")) - (patches (search-patches "ghc-9.2-grep-warnings.patch")) + (patches (search-patches "ghc-9.2-grep-warnings.patch" + "ghc-testsuite-recomp015-execstack.patch")) (modules '((guix build utils))) (snippet ;; collections.Iterable was moved to collections.abc in Python 3.10. @@ -1347,7 +1352,8 @@ interactive environment for the functional language Haskell.") "/ghc-" version "-src.tar.xz")) (sha256 (base32 - "07028i0hm74svvq9b3jpkczaj6lsdgn3hgr4wa7diqiq3dypj1h6")))) + "07028i0hm74svvq9b3jpkczaj6lsdgn3hgr4wa7diqiq3dypj1h6")) + (patches (search-patches "ghc-9-StgCRunAsm-only-when-needed.patch")))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases '%standard-phases) @@ -1378,7 +1384,8 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "19ha0hidrijawy53vm2r0sgml5zkl8126mqy7p0pyacmw3k7913l")) - (patches (search-patches "ghc-9.2-grep-warnings.patch")))) + (patches (search-patches "ghc-9.2-grep-warnings.patch" + "ghc-testsuite-recomp015-execstack.patch")))) ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) @@ -1468,7 +1475,8 @@ interactive environment for the functional language Haskell.") "/ghc-" version "-src.tar.xz")) (sha256 (base32 - "1qk7rlqf02s3b6m6sqqngmjq1mxnrz88h159lz6k25gddmdg5kp8")))) + "1qk7rlqf02s3b6m6sqqngmjq1mxnrz88h159lz6k25gddmdg5kp8")) + (patches (search-patches "ghc-9-StgCRunAsm-only-when-needed.patch")))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases '%standard-phases) @@ -1486,7 +1494,8 @@ interactive environment for the functional language Haskell.") version "/ghc-" version "-testsuite.tar.xz")) (sha256 (base32 - "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3")))) + "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3")) + (patches (search-patches "ghc-testsuite-recomp015-execstack.patch")))) ("ghc-alex" ,ghc-alex-bootstrap-for-9.4) ("ghc-happy" ,ghc-happy-bootstrap-for-9.4) ,@(filter (match-lambda |