all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#71785] [PATCH core-updates] build-system/meson: Add #:out-of-source? argument to build system.
@ 2024-06-26 15:43 Dariqq
  0 siblings, 0 replies; only message in thread
From: Dariqq @ 2024-06-26 15:43 UTC (permalink / raw)
  To: 71785; +Cc: Dariqq

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





^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2024-06-26 15:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-26 15:43 [bug#71785] [PATCH core-updates] build-system/meson: Add #:out-of-source? argument to build system Dariqq

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.