From eb9a603317c4b8a77079f0a9ebd3ea802a0ed8df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Feb 2017 19:57:50 +0200 Subject: gnu: libelf: Support aarch64. * gnu/packages/elf.scm (libelf)[arguments]: Modify custom configure phase to declare host type on aarch64. --- gnu/packages/elf.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages/elf.scm') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 35b644906b..95ba7618a1 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2017 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -78,7 +79,7 @@ addr2line, and more.") (base32 "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr")))) (build-system gnu-build-system) - (arguments '(#:phases (alist-replace + (arguments `(#:phases (alist-replace 'configure (lambda* (#:key outputs #:allow-other-keys) ;; This old `configure' script doesn't support @@ -87,7 +88,12 @@ addr2line, and more.") (setenv "CONFIG_SHELL" (which "bash")) (zero? (system* "./configure" - (string-append "--prefix=" out))))) + (string-append "--prefix=" out) + ,@(if (string=? "aarch64-linux" + (%current-system)) + '("--host=aarch64-unknown-linux-gnu") + '()) + )))) %standard-phases))) (home-page "http://www.mr511.de/software/english.html") (synopsis "ELF object file access library") -- cgit v1.2.3 From db700d58299dd0a063622de519ae42afe33c3ee5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Feb 2017 20:05:40 +0200 Subject: gnu: libelf: Use 'modify-phases'. * gnu/packages/elf.scm (libelf)[arguments]: Use 'modify-phases'. --- gnu/packages/elf.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu/packages/elf.scm') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 95ba7618a1..c68604cf83 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -79,22 +79,22 @@ addr2line, and more.") (base32 "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr")))) (build-system gnu-build-system) - (arguments `(#:phases (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; This old `configure' script doesn't support - ;; variables passed as arguments. - (let ((out (assoc-ref outputs "out"))) - (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* "./configure" - (string-append "--prefix=" out) - ,@(if (string=? "aarch64-linux" - (%current-system)) - '("--host=aarch64-unknown-linux-gnu") - '()) - )))) - %standard-phases))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; This old `configure' script doesn't support + ;; variables passed as arguments. + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* "./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