From: Marius Bakke <mbakke@fastmail.com>
To: 30761@debbugs.gnu.org
Subject: [bug#30761] [PATCH staging 5/9] build-system/meson: Skip the 'fix-runpath' phase on armhf.
Date: Fri, 9 Mar 2018 19:11:04 +0100 [thread overview]
Message-ID: <20180309181108.22888-5-mbakke@fastmail.com> (raw)
In-Reply-To: <20180309181108.22888-1-mbakke@fastmail.com>
* 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.
---
guix/build-system/meson.scm | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index d7754e460..f780a3c8b 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -81,7 +81,14 @@
(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. The
+ ;; consequence is that some packages may have superfluous
+ ;; RUNPATH entries and thus runtime dependencies.
+ ,@(if (not (string-prefix? "arm" (or (%current-target-system)
+ (%current-system))))
+ `(("patchelf" ,(default-patchelf)))
+ '())
,@native-inputs))
(host-inputs `(,@(if source
`(("source" ,source))
@@ -139,7 +146,11 @@ has a 'meson.build' file."
#: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?
--
2.16.2
next prev parent reply other threads:[~2018-03-09 18:12 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-09 18:09 [bug#30761] [PATCH staging 0/9] Meson fixes (and some updates) Marius Bakke
2018-03-09 18:11 ` [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable Marius Bakke
2018-03-09 18:11 ` [bug#30761] [PATCH staging 2/9] gnu: meson-for-build: Update to 0.44.0 Marius Bakke
2018-03-11 22:18 ` Ludovic Courtès
2018-03-09 18:11 ` [bug#30761] [PATCH staging 3/9] gnu: meson: Update to 0.45.0 Marius Bakke
2018-03-11 22:18 ` Ludovic Courtès
2018-03-09 18:11 ` [bug#30761] [PATCH staging 4/9] build-system/meson: Add the output directory to RUNPATH Marius Bakke
2018-03-11 22:23 ` Ludovic Courtès
2018-03-12 13:04 ` Marius Bakke
2018-03-09 18:11 ` Marius Bakke [this message]
2018-03-11 22:24 ` [bug#30761] [PATCH staging 5/9] build-system/meson: Skip the 'fix-runpath' phase on armhf Ludovic Courtès
2018-03-12 13:05 ` Marius Bakke
2018-03-09 18:11 ` [bug#30761] [PATCH staging 6/9] gnu: libinput: Update to 1.10.2 Marius Bakke
2018-03-11 22:25 ` Ludovic Courtès
2018-03-09 18:11 ` [bug#30761] [PATCH staging 7/9] gnu: libinput: Correct inputs Marius Bakke
2018-03-11 22:25 ` Ludovic Courtès
2018-03-12 13:20 ` Marius Bakke
2018-03-09 18:11 ` [bug#30761] [PATCH staging 8/9] gnu: libwacom: Update to 0.29 Marius Bakke
2018-03-11 22:26 ` Ludovic Courtès
2018-03-09 18:11 ` [bug#30761] [PATCH staging 9/9] gnu: xf86-input-wacom: Update to 0.36.0 Marius Bakke
2018-03-11 22:26 ` Ludovic Courtès
2018-05-07 9:54 ` Ludovic Courtès
2018-05-07 14:21 ` bug#30761: " Marius Bakke
2018-03-09 18:16 ` [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable Marius Bakke
2018-03-11 22:17 ` Ludovic Courtès
2018-03-12 12:47 ` Marius Bakke
2018-03-12 13:08 ` Marius Bakke
2018-03-12 14:01 ` Ludovic Courtès
2018-03-12 14:00 ` Ludovic Courtès
2018-03-12 14:44 ` Marius Bakke
2018-03-12 16:16 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180309181108.22888-5-mbakke@fastmail.com \
--to=mbakke@fastmail.com \
--cc=30761@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.