From c36615877ba866bda314356b03167c7f2d9b08d9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Feb 2018 04:58:14 +0100 Subject: gnu: patchelf: Update phase style. * gnu/packages/elf.scm (patchelf)[arguments]: Use MODIFY-PHASES syntax and INVOKE, and end phase with #t. --- gnu/packages/elf.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/elf.scm') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 876014a850..f11cab7efc 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -127,14 +127,14 @@ Executable and Linkable Format (@dfn{ELF}). This includes @command{ld}, '())) (arguments (if (string-prefix? "arm" (or (%current-target-system) (%current-system))) - `(#:phases (alist-cons-after - 'unpack 'patch/rework-for-arm - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch-file - (assoc-ref inputs "patch/rework-for-arm"))) - (zero? (system* "patch" "--force" "-p1" - "--input" patch-file)))) - %standard-phases)) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch/rework-for-arm + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch-file + (assoc-ref inputs "patch/rework-for-arm"))) + (invoke "patch" "--force" "-p1" + "--input" patch-file) + #t))))) '())) (home-page "http://nixos.org/patchelf.html") -- cgit v1.2.3 From 257d8974e6593dc84fde42553934b1d9e40ec586 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Mar 2018 02:56:47 -0400 Subject: gnu: libelf: Use invoke. * gnu/packages/elf.scm (libelf)[arguments]: Use invoke in the configure phase. --- gnu/packages/elf.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/elf.scm') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 08d92532fa..fa1fb46aa4 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -90,13 +90,12 @@ Executable and Linkable Format (@dfn{ELF}). This includes @command{ld}, ;; variables passed as arguments. (let ((out (assoc-ref outputs "out"))) (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* "./configure" - (string-append "--prefix=" out) + (invoke "./configure" + (string-append "--prefix=" out) ,@(if (string=? "aarch64-linux" (%current-system)) '("--host=aarch64-unknown-linux-gnu") - '()))))))))) + '())))))))) (home-page "http://www.mr511.de/software/english.html") (synopsis "ELF object file access library") (description "Libelf is a C library to access ELF object files.") -- cgit v1.2.3 From 8b71684a2086182528c16b5e21599013420ea84c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 2 Jun 2018 17:12:05 -0400 Subject: gnu: elfutils: Disable test suite on MIPS. * gnu/packages/elf.scm (elfutils)[arguments]: Add (#:tests? #f) on MIPS. --- gnu/packages/elf.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/elf.scm') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index eaa9ab5f51..9b120751d2 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -56,6 +56,14 @@ `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) + + ;; Disable tests on MIPS (without changing + ;; the arguments list on other systems). + ,@(if (string-prefix? "mips" (or (%current-target-system) + (%current-system))) + '(#:tests? #f) + '()) + #:phases (modify-phases %standard-phases ;; No reason has been found for this test to reliably fail on aarch64-linux. -- cgit v1.2.3