me
/
guix
Archived
1
0
Fork 0
Code

gnu: patchelf: Use 'target-arm32?' for armhf-linux case. 

* gnu/packages/elf.scm (patchelf)[inputs]: Replace armhf-linux detection
logic with 'target-arm32?' macro.
[arguments]: Same.
master
Efraim Flashner 2018-03-19 21:33:29 +02:00
parent 4eade64706
commit c24f1f1614
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/elf.scm
View File

@ -22,6 +22,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages elf) (define-module (gnu packages elf)
#:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -121,12 +122,12 @@ Executable and Linkable Format (@dfn{ELF}). This includes @command{ld},
;; patch makes significant changes to the algorithm, possibly ;; patch makes significant changes to the algorithm, possibly
;; introducing bugs. So, we apply the patch only on ARM systems. ;; introducing bugs. So, we apply the patch only on ARM systems.
(inputs (inputs
(if (string-prefix? "arm" (or (%current-target-system) (%current-system))) (if (target-arm32?)
`(("patch/rework-for-arm" ,(search-patch `(("patch/rework-for-arm" ,(search-patch
"patchelf-rework-for-arm.patch"))) "patchelf-rework-for-arm.patch")))
'())) '()))
(arguments (arguments
(if (string-prefix? "arm" (or (%current-target-system) (%current-system))) (if (target-arm32?)
`(#:phases (alist-cons-after `(#:phases (alist-cons-after
'unpack 'patch/rework-for-arm 'unpack 'patch/rework-for-arm
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)