From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euMUx-0005pr-CW for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euMUt-0003Do-VS for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:44897) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euMUt-0003Db-Ql for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1euMUt-0005Ir-Le for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:03 -0500 Subject: [bug#30761] [PATCH staging 5/9] build-system/meson: Skip the 'fix-runpath' phase on armhf. Resent-Message-ID: From: Marius Bakke Date: Fri, 9 Mar 2018 19:11:04 +0100 Message-Id: <20180309181108.22888-5-mbakke@fastmail.com> In-Reply-To: <20180309181108.22888-1-mbakke@fastmail.com> References: <20180309181108.22888-1-mbakke@fastmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30761@debbugs.gnu.org * 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