From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MNADOESGJmEjkQAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:04:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id CPqmM0SGJmESIAAA1q6Kng (envelope-from ) for ; Wed, 25 Aug 2021 18:04:52 +0000 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 A00BE7033 for ; Wed, 25 Aug 2021 20:04:52 +0200 (CEST) Received: from localhost ([::1]:57896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGd-00017h-NK for larch@yhetil.org; Wed, 25 Aug 2021 14:04:51 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629914692; 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=P9X8uKM/apMrnq19smxjhhvb6ejxi/z8vnlKq4vHemo=; b=R/LvEwnA8/hPD87Sfirg2kclg6ces+tZIZBhRkb8rk9elGAlRMWlx5Yn2b5vGleGMDXGvE kD797taglGiOgdruVO/XJUC7+McuLVjDmCOiEksRnuEDcG+8zSBIkWhDEe53ocWTcWwjjC /iVLr+YLwlzMzT9OEg2ECHgrklorfic6SPKFNWvXbnI1gqKRSopLbla4ghbZDUbgGFwDrl o7tINQpLMxgv2hEsteW/78Ij0Dv37P2OUquHPqmJIfbp8lRkYRWrhu+JgcLTdAIEJlt5oq znL42OQF4qxW68OGRYCgjJFkGudahhHpYn5HHGF6U3JQvUgq/6JH9C2U1tv7ew== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914692; a=rsa-sha256; cv=none; b=CqGb/WzAQ/PGlJH8kGHU4+jlPjVJJ4Aq4539EVW5dlozmIeeauQch0dt7q2mdaq1dmoqVw lTU45+PID3hf31xUl6ZJaXDEAlZRiiz0BXlVyqqVM27VfmGQF1kJ5+yodZApTpH1tdA8/Z 2MxoGoA4GpYiwMdXGi/d0UsJUKe7b/sOVgp6mJjb1G7nHUUdiUXmonE1IAUzxhwqWO0L7I zeuStENEf30puF5XjQLA8im8iGXmbf9N6TY2wo4SWIIIHBDJmQ5G4np8mfoeiLhbizWpqj +WMc09OJCc4pGH0ikhAyTgb9tsQ+giYgCPdW6asAiMDn/16SImPfMzP9hFv+wQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=PTEe1JRA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=PTEe1JRA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: A00BE7033 X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: iq4ofaqrrsf7 * 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 -- 2.33.0