From patchwork Wed Aug 25 18:02:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32261 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6E89227BBE1; Wed, 25 Aug 2021 19:04:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E3E3227BBE3 for ; Wed, 25 Aug 2021 19:04:55 +0100 (BST) Received: from localhost ([::1]:57896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGh-00017h-1h for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:04:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFv-0007zQ-FN for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36176) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFv-0000rN-6A for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFv-0002nw-1d for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 10/52] build-system/meson: Allow 'configure-flags' to be a G-exp. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991463910605 (code B ref 50201); Wed, 25 Aug 2021 18:04:07 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:59 +0000 Received: from localhost ([127.0.0.1]:47685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFn-0002kt-0K for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:59 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFX-0002gL-4U for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:43 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3iTn; Wed, 25 Aug 2021 20:03:42 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:50 +0200 Message-Id: <20210825180332.5720-10-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914622; bh=P9X8uKM/apMrnq19smxjhhvb6ejxi/z8vnlKq4vHemo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PTEe1JRAsrsNLa+Boh/wwtoaI0gf/4LtiYfNoyPiKWx6l9gLTcv8vnZrOfJ8Usx/C isMV5fjYCQIaYHpf07RwwQI7j91HMr20sRWFMlcBpkW/HaevU4rNAlpV1jjQBL1MgU YltseybqqXW2RSFQQ5/7MyVjYiErPcGM2i9ymuIPwxmOIbI5LqEDPlRysZs52zul99 T+JKmjPiqchIEMKGED2me5/IaAz0C1pFMuDOWE5um2mr2QNelxf2xRhIhYx+D9pl4H 2thdPmeNp/bioRaJexoidntnnx638GpFtW/WMrGWIPaF3TCEOXg8ngU2WC1NmFqBHo /vespqCNkLWrg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build-system/meson.scm (meson-build, meson-cross-build): Only call 'sexp->gexp' on 'configure-flags' when 'configure-flags' is a pair. --- guix/build-system/meson.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index dae0abde94..dcad3f322d 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -212,7 +212,10 @@ has a 'meson.build' file." (map search-path-specification->sexp search-paths)) #:phases build-phases - #:configure-flags #$(sexp->gexp configure-flags) + #:configure-flags + #$(if (pair? configure-flags) + (sexp->gexp configure-flags) + configure-flags) #:build-type #$build-type #:tests? #$tests? #:test-target #$test-target @@ -309,7 +312,9 @@ SOURCE has a 'meson.build' file." #:phases build-phases #:make-dynamic-linker-cache? #$make-dynamic-linker-cache? #:configure-flags `("--cross-file" #+cross-file - ,@#$(sexp->gexp configure-flags)) + ,@#$(if (pair? configure-flags) + (sexp->gexp configure-flags) + configure-flags)) #:build-type #$build-type #:tests? #$tests? #:test-target #$test-target