diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-24 17:58:20 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-24 18:02:43 +0100 |
| commit | c75db693713e74a632bafe849de68a87ee7e34eb (patch) | |
| tree | 5596fe00aab0e7aa7ad41f15c7e3d8ee7d67aa97 /gnu/local.mk | |
| parent | 53de3e74fac862bc07de160e8e226372de213dd1 (diff) | |
| download | guix-c75db693713e74a632bafe849de68a87ee7e34eb.tar.gz | |
gnu: ghc: Really disable test that fails with glibc 2.30 and later.
This follows up commit 2e9c43aa9adac2bd6bcf92373d1cf9f322afa5a3, 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.
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 38dec7f081..f335ee1d25 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -930,9 +930,10 @@ dist_patch_DATA = \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ %D%/packages/patches/geoclue-config.patch \ - %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ - %D%/packages/patches/ghc-diff-swap-cover-args.patch \ + %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ + %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ + %D%/packages/patches/ghc-diff-swap-cover-args.patch \ %D%/packages/patches/ghc-haddock-api-fix-haddock.patch \ %D%/packages/patches/ghc-hpack-fix-tests.patch \ %D%/packages/patches/ghc-microlens-aeson-fix-tests.patch \ |