From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id uLdfHAjxUWbYTQAAA41jLg (envelope-from ) for ; Sat, 25 May 2024 16:09:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id GLgbGQjxUWb1SwAA62LTzQ (envelope-from ) for ; Sat, 25 May 2024 16:09:12 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=j+82SxCx; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716646152; a=rsa-sha256; cv=none; b=QBmtplOF9uU45YwYR4Ar5OHfmDW1aVgH1Q9/EhH8PwNqw9UPcdivYdMEaA03TkgRNxVwAE sIXkCKg98m0ZVtM7qJIDFcCwoUBMke4r1u39oIBv2VaIcdTjq3V5kKD74YoAqsyIQOwPh8 /mXbQGkqVR7cc3XV6VSEUhG1Pb0GrppA6GIGJFi3TSo8cNeGy2gTlQNN4kHgIyrBC+AgO5 hDBg4uIE0D3mg82oSpqfcDz1XwWgGp6WfhMNBdi5Wjw4ZiFAQ5kBqcq+gyizyCIZgK3dRG WsGjWG0hPPBQY8oNZtBw53uDjit6WfNhEY8QzIYdv/jFAerpu99R9+ZCi2LzBQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=j+82SxCx; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1716646152; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9wPjK+W4re2LyVGVpq5/FRtplFMEjOAYmAvmeLrXuMo=; b=qqOiqICUUeXR99vq52x6vN9GZkNGCjHFRkIX3MeXHaQziKnLJIsSewuOmTU0svpQke2q9p R726POQI4JbSF7FqMF69Q/s5JW1hsbICZ8SVMvfj10nzA2/V1KO7sPEsL+P3rmvSyEOC5W 9mtjfb5w9n1gvV0/XojWn4hKjAGFl6qeAIHj7zHK2GjlOyxSomHEY5zSQv5xdCVnUpWb0O SGOOPxuytisK0/nI1/pEBrCvutlMA5PFYgyo6/2yDH9BFU18iqjC6g7/sLi7SwW49SO9wS y3AunEleotEz84tHg8mOV5InzYBbHbRZflm0Lg1r995FC+lrpcHqhqWLZ3Ia1A== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 522781ACA6 for ; Sat, 25 May 2024 16:09:12 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAs4u-0007c4-RX; Sat, 25 May 2024 10:08:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sAs4s-0007bp-KG for bug-guix@gnu.org; Sat, 25 May 2024 10:08:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sAs4s-0002HX-C6 for bug-guix@gnu.org; Sat, 25 May 2024 10:08:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAs4z-0000Ht-T1 for bug-guix@gnu.org; Sat, 25 May 2024 10:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#70999: [PATCH] build-system/meson: Add #:out-of-source? argument to build system. References: <3ec197ca-3e22-4108-8277-9960a4be88be@posteo.net> In-Reply-To: <3ec197ca-3e22-4108-8277-9960a4be88be@posteo.net> Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 25 May 2024 14:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70999 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 70999@debbugs.gnu.org Cc: Dariqq , ludo@gnu.org Received: via spool by 70999-submit@debbugs.gnu.org id=B70999.17166461341077 (code B ref 70999); Sat, 25 May 2024 14:09:01 +0000 Received: (at 70999) by debbugs.gnu.org; 25 May 2024 14:08:54 +0000 Received: from localhost ([127.0.0.1]:43647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAs4r-0000HJ-Q9 for submit@debbugs.gnu.org; Sat, 25 May 2024 10:08:54 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAs4q-0000Gs-4o for 70999@debbugs.gnu.org; Sat, 25 May 2024 10:08:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 15FB0240103 for <70999@debbugs.gnu.org>; Sat, 25 May 2024 16:08:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1716646118; bh=9Lsw3mwnjUcs1iH/1plgU+J6L9fEPnui7FpZ9qJ5kmY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=j+82SxCxmB/Zlc9gZAX0MlOCzdkAkP/0ESUqUvemNLB9gF4DqFGmFgY8xBgt82Upn rCBuyESN7Ug2YVOuJVn4SFBp7D8W1HMTvyN50yX/5knTvakA91l1OWbmwNrWgW0pD7 kohudWTfQCxUp3twoxWkxsIjxw2MMK9/fyqws/KFYkqmccQdxNGV9SbjQw2IdGUdjQ WQ6zdR8rJSrt2feElZ3Xswi5+H2z7r/xBB5QbdbHNOpcA8vP2VHCUKj+nPULU6qeOK cC/z9Ohl2UzOd+ZHB84wBO+3QEaGgaHVnXZDs8FfP8xjQ/HABwtd8LHLTd2UCSKuQx 7KuurZ96rqM/g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4VmkKK2py4z9rxF; Sat, 25 May 2024 16:08:37 +0200 (CEST) From: Dariqq Date: Sat, 25 May 2024 14:02:19 +0000 Message-ID: <55230dcd23f65c3caa3ea61ed2b18c672b389211.1716645739.git.dariqq@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 522781ACA6 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 3.95 X-Spam-Score: 3.95 X-TUID: M01gT7RBMdu8 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. 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.41.0