diff options
| author | Marius Bakke <marius@gnu.org> | 2022-02-13 14:24:53 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-02-13 14:24:53 +0100 |
| commit | 76b6bbdf232b4b82cdd23cfe0d81331a4fd2edec (patch) | |
| tree | 0e6a57ba08b9c6f9f5cbcdc5b5d9daeea91e428d /gnu/packages/elf.scm | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
| parent | e8af2ea63a7f497b8f8e19e206645109c0646e72 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/elf.scm')
| -rw-r--r-- | gnu/packages/elf.scm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index d4f75c9726..414d6a2856 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, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com> @@ -98,7 +98,14 @@ (lambda _ (substitute* "tests/Makefile.in" (("run-backtrace-native.sh") "")) - #t))))) + #t)) + ,@(if (target-riscv64?) + `((add-after 'unpack 'disable-failing-riscv64-test + (lambda _ + ;; dwfl_thread_getframes: No DWARF information found + (substitute* "tests/Makefile.in" + (("run-backtrace-dwarf.sh") ""))))) + '())))) (native-inputs (list m4)) (inputs (list zlib)) @@ -274,4 +281,7 @@ static analysis of the ELF binaries at hand.") (description "PatchELF allows the ELF \"interpreter\" and RPATH of an ELF binary to be changed.") + ;; This can probably be removed with the next release. + (properties + '((release-monitoring-url . "https://github.com/NixOS/patchelf/releases"))) (license gpl3+))) |