diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/haskell.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch | 10 |
3 files changed, 3 insertions, 17 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 95a624eef70..283c725f167 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -1455,7 +1455,6 @@ dist_patch_DATA = \ | |||
| 1455 | %D%/packages/patches/ghc-basement-fix-32-bit.patch \ | 1455 | %D%/packages/patches/ghc-basement-fix-32-bit.patch \ |
| 1456 | %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ | 1456 | %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ |
| 1457 | %D%/packages/patches/ghc-testsuite-grep-compat.patch \ | 1457 | %D%/packages/patches/ghc-testsuite-grep-compat.patch \ |
| 1458 | %D%/packages/patches/ghc-testsuite-recomp015-execstack.patch \ | ||
| 1459 | %D%/packages/patches/ghc-aeson-encodeDouble.patch \ | 1458 | %D%/packages/patches/ghc-aeson-encodeDouble.patch \ |
| 1460 | %D%/packages/patches/ghc-basement-fix-32bit.patch \ | 1459 | %D%/packages/patches/ghc-basement-fix-32bit.patch \ |
| 1461 | %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \ | 1460 | %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \ |
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6bba8bccbb1..aa144930f84 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm | |||
| @@ -1670,8 +1670,7 @@ SRC_HC_OPTS += -optc-mno-outline-atomics | |||
| 1670 | (sha256 | 1670 | (sha256 |
| 1671 | (base32 | 1671 | (base32 |
| 1672 | "1m5fzhr4gjn9ni8gxx7ag3fkbw1rspjzgv39mnfb0nkm5mw70v3s")) | 1672 | "1m5fzhr4gjn9ni8gxx7ag3fkbw1rspjzgv39mnfb0nkm5mw70v3s")) |
| 1673 | (patches (search-patches "ghc-9.2-grep-warnings.patch" | 1673 | (patches (search-patches "ghc-9.2-grep-warnings.patch")) |
| 1674 | "ghc-testsuite-recomp015-execstack.patch")) | ||
| 1675 | (modules '((guix build utils))) | 1674 | (modules '((guix build utils))) |
| 1676 | (snippet | 1675 | (snippet |
| 1677 | ;; collections.Iterable was moved to collections.abc in Python 3.10. | 1676 | ;; collections.Iterable was moved to collections.abc in Python 3.10. |
| @@ -2097,8 +2096,7 @@ SRC_HC_OPTS += -optc-mno-outline-atomics | |||
| 2097 | (file-name "ghc-testsuite.tar.xz") | 2096 | (file-name "ghc-testsuite.tar.xz") |
| 2098 | (sha256 | 2097 | (sha256 |
| 2099 | (base32 | 2098 | (base32 |
| 2100 | "1hxylm3nhxzl7yidarlavvcg1240w4bk0hy5jnvwna24jyxz69i6")) | 2099 | "1hxylm3nhxzl7yidarlavvcg1240w4bk0hy5jnvwna24jyxz69i6"))) |
| 2101 | (patches (search-patches "ghc-testsuite-recomp015-execstack.patch"))) | ||
| 2102 | (origin | 2100 | (origin |
| 2103 | (method url-fetch) | 2101 | (method url-fetch) |
| 2104 | (uri (string-append "https://downloads.haskell.org/~ghc/" | 2102 | (uri (string-append "https://downloads.haskell.org/~ghc/" |
| @@ -2176,8 +2174,7 @@ interactive environment for the functional language Haskell.") | |||
| 2176 | version "/ghc-" version "-testsuite.tar.xz")) | 2174 | version "/ghc-" version "-testsuite.tar.xz")) |
| 2177 | (sha256 | 2175 | (sha256 |
| 2178 | (base32 | 2176 | (base32 |
| 2179 | "143ifc4g3jc6s9hcry5qha913rzwg4hpsvk6pqvxk5r0qigfxjwx")) | 2177 | "143ifc4g3jc6s9hcry5qha913rzwg4hpsvk6pqvxk5r0qigfxjwx")))) |
| 2180 | (patches (search-patches "ghc-testsuite-recomp015-execstack.patch")))) | ||
| 2181 | (replace "hadrian-bootstrap-sources.tar.gz" | 2178 | (replace "hadrian-bootstrap-sources.tar.gz" |
| 2182 | (origin | 2179 | (origin |
| 2183 | (method url-fetch) | 2180 | (method url-fetch) |
diff --git a/gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch b/gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch deleted file mode 100644 index 0d4849f53e7..00000000000 --- a/gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | --- a/testsuite/tests/driver/recomp015/Makefile 2024-01-13 16:22:42.643106725 +0100 | ||
| 2 | +++ b/testsuite/tests/driver/recomp015/Makefile 2024-01-13 16:23:18.406867917 +0100 | ||
| 3 | @@ -26,6 +26,7 @@ | ||
| 4 | # number of sections) | ||
| 5 | '$(TEST_HC)' $(TEST_HC_OPTS) Generate.hs | ||
| 6 | ./Generate > ManySections.s | ||
| 7 | + echo '.section .note.GNU-stack,"",@progbits' >> ManySections.s | ||
| 8 | echo 'main = putStrLn "Running main..."' > Main.hs | ||
| 9 | '$(TEST_HC)' $(TEST_HC_OPTS) -c ManySections.s | ||
| 10 | '$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs ManySections.o | ||
