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

[Marius Bakke]

mbakke pushed a commit to branch staging
in repository guix.

commit d5b5a15a4046362377f1a45d466b43bb6e93d4f8
Author: Marius Bakke <address@hidden>
Date:   Fri Mar 9 17:32:20 2018 +0100

    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.
---
 guix/build-system/meson.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index d7754e4..529a2b8 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Peter Mikkelsen <address@hidden>
+;;; Copyright © 2018 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -80,8 +81,15 @@
          (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 @@ 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?