mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-15 19:40:46 +02:00
gnu: ghc: Really disable test that fails with glibc 2.30 and later.
This follows up commit 2e9c43aa9a
, which was
incomplete. Fixes <https://bugs.gnu.org/39358>.
* gnu/packages/patches/ghc-testsuite-dlopen-pie.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly. Also use tabs instead
of spaces on surrounding patches.
* gnu/packages/haskell.scm (ghc-8.6)[native-inputs]: Add patch for
"ghc-testsuite".
[arguments]: Remove incomplete workaround for the same issue.
This commit is contained in:
parent
53de3e74fa
commit
c75db69371
3 changed files with 59 additions and 9 deletions
|
@ -19,7 +19,7 @@
|
|||
;;; Copyright © 2018, 2019 Gabriel Hondet <gabrielhondet@gmail.com>
|
||||
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
|
||||
;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
|
||||
;;; Copyright © Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -568,6 +568,7 @@ interactive environment for the functional language Haskell.")
|
|||
(uri (string-append
|
||||
"https://www.haskell.org/ghc/dist/"
|
||||
version "/" name "-" version "-testsuite.tar.xz"))
|
||||
(patches (search-patches "ghc-testsuite-dlopen-pie.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pw9r91g2np3i806g2f4f8z4jfdd7mx226cmdizk4swa7av1qf91"))))
|
||||
|
@ -591,12 +592,6 @@ interactive environment for the functional language Haskell.")
|
|||
(("^test\\('T8108'") "# guix skipped: test('T8108'"))
|
||||
(substitute* "libraries/unix/tests/libposix/all.T"
|
||||
(("^test\\('posix010'") "# guix skipped: test('posix010'"))
|
||||
;; This test attempts to dlopen() a position-independent
|
||||
;; executable(!), which is disallowed since glibc 2.30. See
|
||||
;; https://sourceware.org/bugzilla/show_bug.cgi?id=24323
|
||||
(substitute* "testsuite/tests/dynlibs/Makefile"
|
||||
(("\\./T13702a")
|
||||
"# ./T13702a"))
|
||||
#t))))))
|
||||
(native-search-paths (list (search-path-specification
|
||||
(variable "GHC_PACKAGE_PATH")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue