futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "build-system/meson: Use 'target-arm32?' for armhf-linux case."

Browse Source 
This requires adding (guix utils) to the build inputs, and causes too many
rebuilds for now.

This reverts commit 24a2e9172a.
This commit is contained in:
Marius Bakke 2018-03-20 00:03:05 +01:00
parent b1d096f869
commit 061f204dcd
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,8 @@
;; to avoid superfluous entries in RUNPATH as described ;; to avoid superfluous entries in RUNPATH as described
;; in <https://bugs.gnu.org/28444#46>, so armhf may now ;; in <https://bugs.gnu.org/28444#46>, so armhf may now
;; have different runtime dependencies from other arches. ;; have different runtime dependencies from other arches.
,@(if (not (target-arm32?)) ,@(if (not (string-prefix? "arm" (or (%current-target-system)
(%current-system))))
`(("patchelf" ,(default-patchelf))) `(("patchelf" ,(default-patchelf)))
'()) '())
,@native-inputs)) ,@native-inputs))
@ -147,7 +148,8 @@ has a 'meson.build' file."
#:search-paths ',(map search-path-specification->sexp #:search-paths ',(map search-path-specification->sexp
search-paths) search-paths)
#:phases #:phases
(if (target-arm32?) (if (string-prefix? "arm" ,(or (%current-target-system)
(%current-system)))
(modify-phases build-phases (delete 'fix-runpath)) (modify-phases build-phases (delete 'fix-runpath))
build-phases) build-phases)
#:configure-flags ,configure-flags #:configure-flags ,configure-flags