guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit f8b10e0a603f05deb942b576f11cdb42a7dfd8f3 Author: Nicolas Graves <[email protected]> AuthorDate: Thu Oct 31 13:46:40 2024 +0100 gnu: ghc: More robust build with binutils ≥ 2.39. Future versions of ghc will have more occurrences of the execstack warning. Instead of modifying the tests for each new version, a more robust approach is to explicitely make ghc pass -Wl,-z,noexecstack to its ld invocations during all tests. This is what this patch does. * gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch: Remove it. * gnu/local.mk (disp_path_DATA): Deregister patch. * gnu/packages/haskell.scm (ghc-9.0, ghc-9.8, ghc-9.10): Deregister patch use. Change-Id: Ib174c017eef512eda9b4754178a927517c7f05a1 Signed-off-by: Ludovic Courtès <[email protected]> Merges: #6651 --- gnu/local.mk | 1 - gnu/packages/haskell.scm | 9 +++------ 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 b2ab108f253..59b22e12aaa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1468,7 +1468,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-basement-fix-32-bit.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ %D%/packages/patches/ghc-testsuite-grep-compat.patch \ - %D%/packages/patches/ghc-testsuite-recomp015-execstack.patch \ %D%/packages/patches/ghc-aeson-encodeDouble.patch \ %D%/packages/patches/ghc-basement-fix-32bit.patch \ %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \ diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 56ccab3b45a..dd7d2d363ab 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1670,8 +1670,7 @@ SRC_HC_OPTS += -optc-mno-outline-atomics (sha256 (base32 "1m5fzhr4gjn9ni8gxx7ag3fkbw1rspjzgv39mnfb0nkm5mw70v3s")) - (patches (search-patches "ghc-9.2-grep-warnings.patch" - "ghc-testsuite-recomp015-execstack.patch")) + (patches (search-patches "ghc-9.2-grep-warnings.patch")) (modules '((guix build utils))) (snippet ;; collections.Iterable was moved to collections.abc in Python 3.10. @@ -2097,8 +2096,7 @@ SRC_HC_OPTS += -optc-mno-outline-atomics (file-name "ghc-testsuite.tar.xz") (sha256 (base32 - "1hxylm3nhxzl7yidarlavvcg1240w4bk0hy5jnvwna24jyxz69i6")) - (patches (search-patches "ghc-testsuite-recomp015-execstack.patch"))) + "1hxylm3nhxzl7yidarlavvcg1240w4bk0hy5jnvwna24jyxz69i6"))) (origin (method url-fetch) (uri (string-append "https://downloads.haskell.org/~ghc/"; @@ -2177,8 +2175,7 @@ interactive environment for the functional language Haskell.") version "/ghc-" version "-testsuite.tar.xz")) (sha256 (base32 - "143ifc4g3jc6s9hcry5qha913rzwg4hpsvk6pqvxk5r0qigfxjwx")) - (patches (search-patches "ghc-testsuite-recomp015-execstack.patch")))) + "143ifc4g3jc6s9hcry5qha913rzwg4hpsvk6pqvxk5r0qigfxjwx")))) (replace "hadrian-bootstrap-sources.tar.gz" (origin (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 @@ ---- a/testsuite/tests/driver/recomp015/Makefile 2024-01-13 16:22:42.643106725 +0100 -+++ b/testsuite/tests/driver/recomp015/Makefile 2024-01-13 16:23:18.406867917 +0100 -@@ -26,6 +26,7 @@ - # number of sections) - '$(TEST_HC)' $(TEST_HC_OPTS) Generate.hs - ./Generate > ManySections.s -+ echo '.section .note.GNU-stack,"",@progbits' >> ManySections.s - echo 'main = putStrLn "Running main..."' > Main.hs - '$(TEST_HC)' $(TEST_HC_OPTS) -c ManySections.s - '$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs ManySections.o
