diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-04-11 17:19:06 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-11 17:19:06 -0400 |
| commit | 3c0316169b47a1c035390aae8a211dcbedc8f5f3 (patch) | |
| tree | 3c89536e1ef0c1db4339175bce7ff64d2e42f591 /gnu/packages/elf.scm | |
| parent | ecfe88b76496c62fad4f6b6c593318378cebba22 (diff) | |
| parent | 87a841b2d4b7f8bfd661ba2d2cd2bbce7f490fbd (diff) | |
| download | gnu-guix-3c0316169b47a1c035390aae8a211dcbedc8f5f3.tar gnu-guix-3c0316169b47a1c035390aae8a211dcbedc8f5f3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/elf.scm')
| -rw-r--r-- | gnu/packages/elf.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index fa1fb46aa4..eaa9ab5f51 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; @@ -55,7 +55,15 @@ ;; know where to find each other. `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") - "/lib")))) + "/lib")) + #:phases + (modify-phases %standard-phases + ;; No reason has been found for this test to reliably fail on aarch64-linux. + (add-after 'unpack 'disable-failing-aarch64-tests + (lambda _ + (substitute* "tests/Makefile.in" + (("run-backtrace-native.sh") "")) + #t))))) (native-inputs `(("m4" ,m4))) (inputs `(("zlib" ,zlib))) |