From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id WEnaCyStm2XMbgEAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:07:00 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id eN/sBiStm2UcqwAAqHPOHw (envelope-from ) for ; Mon, 08 Jan 2024 09:07:00 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704701219; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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; bh=MKIgsK78V8rvgX5bkpKV0lhNctISb6viYOotHdCYvRo=; b=Na+2Voqn/M/3vwoz2ZplKihW0RxfpOzeqTLZj1V9Hsv7VBlXJQDOjuazYjNcGZsukCoJfv HnpTyIh+VnBmKWHhTXWfi9ZcWpmyBTVyB716xatmky/Qo9YZ5ET07QriNgeWpMtWvrFhAf seqZnq/6zZ2XvRxRY44DzZBug3kEF0mYpJuVBF0+CUjFxa71BTby7SaVQb6l/tXnPvMns5 gRwwY5qj3Ys0n6PVDmhbvtBrw+n+Kt1llR+yNPZ+I5fTHXJpNpXij4x0M9lQpGAntXJYa2 Z6MRbFoYOf9EAi4K9XO0YlAS4cglBhjwRAaJI+SefmYFpBYvR4Y7MLfFcUlEtA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701219; a=rsa-sha256; cv=none; b=e+W/Kic1O6slJqda1Cincw2DAOJgRUdzXuH69D1JzGQek5HeWK+m/uQJgKC1oQJxc/M4QT q3Hrbu6LFvl3DyhblHes53W96hPBz7tuRdAo1jxcCFbYoQp++Dv9UmmnMFlCle/mWeAzHS IOToxEWSNPkn9GUv9pJhhKw2F0mJ1FIveCGxdMmtUXMMW/A6P5jGvyK0ZnvWNoJSwU6veK tD2rJ5iMgHgeJOyPrUzmptabFcDkw3pi+YxTJvICh3fe/4y4vdtpXosi/FVyeY+uFxShH7 PoIJVdikx/YQ9Ohs2+sdCTievAoiu/g0z7yDJWJZopJMNW/O+XU4nP/o33QYkA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org 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 E56CC439F0 for ; Mon, 8 Jan 2024 09:06:59 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdL-0003al-BV; Mon, 08 Jan 2024 03:05:19 -0500 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 1rMkdK-0003Zk-4n for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:18 -0500 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 1rMkdJ-00035A-Ss for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:17 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdP-00086Z-UA for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 46/48] build-system: waf: Improve waf-build style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68315@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.170470110730870 (code B ref 68315); Mon, 08 Jan 2024 08:05:23 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:07 +0000 Received: from localhost ([127.0.0.1]:35042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd9-00081e-AC for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:05:07 -0500 Received: from 5.mo560.mail-out.ovh.net ([87.98.181.248]:60385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd3-0007zM-Hu for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:05:02 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.17.93]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4C39A29B8D for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:54 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-r2jvz (unknown [10.110.113.27]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D8D071FE53; Mon, 8 Jan 2024 08:04:53 +0000 (UTC) Received: from ngraves.fr ([37.59.142.110]) by ghost-submission-6684bf9d7b-r2jvz with ESMTPSA id i88NOaWsm2VRIgAAWvdHZA (envelope-from ); Mon, 08 Jan 2024 08:04:53 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:18 +0100 Message-ID: <20240108080350.1665-46-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240108080350.1665-1-ngraves@ngraves.fr> References: <20240108080350.1665-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 12440631022016455394 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddutdenucevlhhushhtvghrufhiiigvpeejnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.79 X-Spam-Score: -6.79 X-Migadu-Queue-Id: E56CC439F0 X-Migadu-Scanner: mx11.migadu.com X-TUID: Z07cFb3kcoTv * guix/build-system/waf.scm (waf-build): Use with-imported-modules around the waf-build builder gexp. Change-Id: Id242046eb4bfef90dba60d7c3b1b68597ddf502e --- guix/build-system/waf.scm | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm index 91b3d0d100..696b6de39d 100644 --- a/guix/build-system/waf.scm +++ b/guix/build-system/waf.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,22 +87,23 @@ (define* (waf-build name inputs "Build SOURCE with INPUTS. This assumes that SOURCE provides a 'waf' file as its build system." (define build - #~(begin - (use-modules #$@(sexp->gexp modules)) + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) - #$(with-build-variables inputs outputs - #~(waf-build #:name #$name - #:source #+source - #:configure-flags #$configure-flags - #:system #$system - #:test-target #$test-target - #:tests? #$tests? - #:phases #$phases - #:outputs %outputs - #:search-paths '#$(sexp->gexp - (map search-path-specification->sexp - search-paths)) - #:inputs %build-inputs)))) + #$(with-build-variables inputs outputs + #~(waf-build #:name #$name + #:source #+source + #:configure-flags #$configure-flags + #:system #$system + #:test-target #$test-target + #:tests? #$tests? + #:phases #$phases + #:outputs %outputs + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:inputs %build-inputs))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) -- 2.41.0