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:
parent
09a45ffb14
commit
d5b5a15a40
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -80,8 +81,15 @@ (define private-keywords
|
|||
(system system)
|
||||
(build-inputs `(("meson" ,meson)
|
||||
("ninja" ,ninja)
|
||||
;; Add patchelf for (guix build rpath) to work.
|
||||
("patchelf" ,(default-patchelf))
|
||||
;; XXX PatchELF fails to build on armhf, so we skip
|
||||
;; 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))
|
||||
(host-inputs `(,@(if source
|
||||
`(("source" ,source))
|
||||
|
@ -139,7 +147,11 @@ (define builder
|
|||
#:inputs %build-inputs
|
||||
#:search-paths ',(map search-path-specification->sexp
|
||||
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
|
||||
#:build-type ,build-type
|
||||
#:tests? ,tests?
|
||||
|
|
Loading…
Reference in a new issue