[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/14: build-system/meson: Define build variables when cross-compiling.
From: |
guix-commits |
Subject: |
01/14: build-system/meson: Define build variables when cross-compiling. |
Date: |
Mon, 20 Dec 2021 10:24:10 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit bdaf38a6e04052a22b62ae41c72f32cf16356314
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Dec 20 14:37:40 2021 +0100
build-system/meson: Define build variables when cross-compiling.
Fixes <https://issues.guix.gnu.org/52574>.
Reported by L p R n d n <guix@lprndn.info>.
* guix/build-system/meson.scm (meson-cross-build)[builder]: Define
'%build-host-inputs', '%build-target-inputs', '%build-inputs', and
'%outputs'.
---
guix/build-system/meson.scm | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index ba7441a..ad604f8 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -287,6 +287,19 @@ SOURCE has a 'meson.build' file."
#~(begin
(use-modules #$@(sexp->gexp modules))
+ (define %build-host-inputs
+ #+(input-tuples->gexp build-inputs))
+
+ (define %build-target-inputs
+ (append #$(input-tuples->gexp host-inputs)
+ #+(input-tuples->gexp target-inputs)))
+
+ (define %build-inputs
+ (append %build-host-inputs %build-target-inputs))
+
+ (define %outputs
+ #$(outputs->gexp outputs))
+
(define build-phases
#$(let ((phases (if (pair? phases) (sexp->gexp phases) phases)))
(if glib-or-gtk?
- branch master updated (b9e5e93 -> 2c469f0), guix-commits, 2021/12/20
- 05/14: gnu: vlang: Update to 0.2.4., guix-commits, 2021/12/20
- 12/14: gnu: bpytop: Fix build., guix-commits, 2021/12/20
- 06/14: gnu: Add udpcast, guix-commits, 2021/12/20
- 10/14: doc: Fix wrong home-shepherd-configuration data type., guix-commits, 2021/12/20
- 14/14: doc: Remove extra closing paren., guix-commits, 2021/12/20
- 01/14: build-system/meson: Define build variables when cross-compiling.,
guix-commits <=
- 04/14: gnu: rust-rayon@1.5: Update dependencies., guix-commits, 2021/12/20
- 13/14: gnu: Add tkrev., guix-commits, 2021/12/20
- 08/14: gnu: rcs: Install man page for rcsfreeze., guix-commits, 2021/12/20
- 11/14: gnu: ghc-microlens: Update home page., guix-commits, 2021/12/20
- 02/14: combinators: Add 'define-compile-time-procedure'., guix-commits, 2021/12/20
- 07/14: doc: cookbook: Simplify inputs in examples., guix-commits, 2021/12/20
- 03/14: services: static-networking: Sanitize <network-address> values., guix-commits, 2021/12/20
- 09/14: gnu: Add rcshist., guix-commits, 2021/12/20