From 220546810830422f8ec3e6a4145fec85429914a1 Mon Sep 17 00:00:00 2001 From: Dariqq Date: Wed, 26 Jun 2024 15:43:32 +0000 Subject: build-system/meson: Add #:out-of-source? argument to build system. Meson currently supports only out-of-source builds. Add the argument out-of-source? with default to #t such that the install-license-files phase searches for the license files in the source directory. * guix/build-system/meson.scm (meson-build): Add out-of-source? argument. (meson-cross-build): Likewise. Change-Id: Ib59d9d93b34fd567f05f5f9a10293f6ab924e399 Signed-off-by: Christopher Baines --- guix/build-system/meson.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 13baf329df..eb2714dd78 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -188,6 +188,7 @@ TRIPLET." (outputs '("out")) (configure-flags ''()) (search-paths '()) + (out-of-source? #t) (build-type "debugoptimized") (tests? #t) (test-options ''()) @@ -237,6 +238,7 @@ has a 'meson.build' file." #$(if (pair? configure-flags) (sexp->gexp configure-flags) configure-flags) + #:out-of-source? #$out-of-source? #:build-type #$build-type #:tests? #$tests? #:test-options #$(if (pair? test-options) @@ -271,7 +273,7 @@ has a 'meson.build' file." (configure-flags ''()) (search-paths '()) (native-search-paths '()) - + (out-of-source? #t) (build-type "debugoptimized") (tests? #f) (test-options ''()) @@ -352,6 +354,7 @@ SOURCE has a 'meson.build' file." ,@#$(if (pair? configure-flags) (sexp->gexp configure-flags) configure-flags)) + #:out-of-source? #$out-of-source? #:build-type #$build-type #:tests? #$tests? #:test-options #$(if (pair? test-options) -- cgit v1.2.3