nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-system/meson: Skip the 'fix-runpath' phase on armhf. 

* guix/build-system/meson.scm (lower): Remove DEFAULT-PATCHELF from inputs
on armhf.
(meson-build): Ignore the 'fix-runpath' phase when building for arm systems.
This commit is contained in:
Marius Bakke 2018-03-09 17:32:20 +01:00
parent 09a45ffb14
commit d5b5a15a40
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
guix/build-system/meson.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -80,8 +81,15 @@
(system system) (system system)
(build-inputs `(("meson" ,meson) (build-inputs `(("meson" ,meson)
("ninja" ,ninja) ("ninja" ,ninja)
;; Add patchelf for (guix build rpath) to work. ;; XXX PatchELF fails to build on armhf, so we skip
("patchelf" ,(default-patchelf)) ;; the 'fix-runpath' phase there for now. It is used
;; to avoid superfluous entries in RUNPATH as described
;; in <https://bugs.gnu.org/28444#46>, so armhf may now
;; have different runtime dependencies from other arches.
,@(if (not (string-prefix? "arm" (or (%current-target-system)
(%current-system))))
`(("patchelf" ,(default-patchelf)))
'())
,@native-inputs)) ,@native-inputs))
(host-inputs `(,@(if source (host-inputs `(,@(if source
`(("source" ,source)) `(("source" ,source))
@ -139,7 +147,11 @@ has a 'meson.build' file."
#:inputs %build-inputs #:inputs %build-inputs
#:search-paths ',(map search-path-specification->sexp #:search-paths ',(map search-path-specification->sexp
search-paths) search-paths)
#:phases build-phases #:phases
(if (string-prefix? "arm" ,(or (%current-target-system)
(%current-system)))
(modify-phases build-phases (delete 'fix-runpath))
build-phases)
#:configure-flags ,configure-flags #:configure-flags ,configure-flags
#:build-type ,build-type #:build-type ,build-type
#:tests? ,tests? #:tests? ,tests?