GNU bug report logs - #71785
[PATCH core-updates] build-system/meson: Add #:out-of-source? argument to build system.

Previous Next

Full log

View this message in rfc822 format

From: Dariqq <dariqq <at> posteo.net>
To: 71785 <at> debbugs.gnu.org
Cc: Dariqq <dariqq <at> posteo.net>
Subject: [bug#71785] [PATCH core-updates] build-system/meson: Add #:out-of-source? argument to build system.
Date: Wed, 26 Jun 2024 15:43:32 +0000

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
---
I have tested this with the tio package (both natively building and cross compiling) and seems to work. This will cause a lot of rebuild!
For the position of the argument I've put it above build-type to match the order in cmake-build-system.

This is the same patch already sent to 70999 and will close 70999 now assigned to guix-patches and for core-updates branch.

 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 bf9ca15ecc..6c085fa1fe 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -176,6 +176,7 @@ (define* (meson-build name inputs
                       (outputs '("out"))
                       (configure-flags ''())
                       (search-paths '())
+                      (out-of-source? #t)
                       (build-type "debugoptimized")
                       (tests? #t)
                       (test-options ''())
@@ -225,6 +226,7 @@ (define* (meson-build name inputs
                              #$(if (pair? configure-flags)
                                    (sexp->gexp configure-flags)
                                    configure-flags)
+                             #:out-of-source? #$out-of-source?
                              #:build-type #$build-type
                              #:tests? #$tests?
                              #:test-options #$(sexp->gexp test-options)
@@ -257,7 +259,7 @@ (define* (meson-cross-build name
                             (configure-flags ''())
                             (search-paths '())
                             (native-search-paths '())
-
+                            (out-of-source? #t)
                             (build-type "debugoptimized")
                             (tests? #f)
                             (test-options ''())
@@ -338,6 +340,7 @@ (define* (meson-cross-build name
                                            ,@#$(if (pair? configure-flags)
                                                    (sexp->gexp configure-flags)
                                                    configure-flags))
+                       #:out-of-source? #$out-of-source?
                        #:build-type #$build-type
                        #:tests? #$tests?
                        #:test-options #$(sexp->gexp test-options)

base-commit: 9756d9d6345fb142944261174453ab0a597cc2e7
-- 
2.45.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.