From patchwork Mon Mar 18 13:55:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 1494 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 4C79116DA7; Mon, 18 Mar 2019 13:56:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id ECF3E16DA1 for ; Mon, 18 Mar 2019 13:56:40 +0000 (GMT) Received: from localhost ([127.0.0.1]:42040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5skq-00072f-DI for patchwork@mira.cbaines.net; Mon, 18 Mar 2019 09:56:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5skL-0006nf-JU for guix-patches@gnu.org; Mon, 18 Mar 2019 09:56:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5skJ-0002Gz-Dy for guix-patches@gnu.org; Mon, 18 Mar 2019 09:56:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35424) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h5skF-0002Dl-A6 for guix-patches@gnu.org; Mon, 18 Mar 2019 09:56:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h5skE-0001TL-MQ for guix-patches@gnu.org; Mon, 18 Mar 2019 09:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34903] [PATCH] build-system/meson: Add #:disallowed-references. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Mar 2019 13:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34903@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15529173595649 (code B ref -1); Mon, 18 Mar 2019 13:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Mar 2019 13:55:59 +0000 Received: from localhost ([127.0.0.1]:48968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5skA-0001T3-NS for submit@debbugs.gnu.org; Mon, 18 Mar 2019 09:55:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5sk6-0001Sv-T1 for submit@debbugs.gnu.org; Mon, 18 Mar 2019 09:55:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:44409) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h5sjy-00025T-EA for submit@debbugs.gnu.org; Mon, 18 Mar 2019 09:55:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5sjx-0006X9-J9 for guix-patches@gnu.org; Mon, 18 Mar 2019 09:55:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5sjt-00023h-PC for guix-patches@gnu.org; Mon, 18 Mar 2019 09:55:43 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:51443) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h5sjs-000227-UW for guix-patches@gnu.org; Mon, 18 Mar 2019 09:55:41 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C8297220B9 for ; Mon, 18 Mar 2019 09:55:38 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 18 Mar 2019 09:55:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=fm2; bh=j1ecP1hS1+8Q03M6Gsq1GRA0IV iW6Ff/YHj+DMZE51U=; b=csrCtfQtjQaDT8XDhaz6LPl9Ocq4Y7XjsEAavI4Uka ECL7oV5QwwJrjZWw7spXzKRvnkKg4lIa+IBiIC38G+g5DLwIobVOQ1p+NGhMdGs6 6rWuFSqXzz0cxwn9nZInyqkHXAfuONsaYthHmvwcYk/M/7WiChVwfOxHK+vJbT3y ueBeZs66rVzEP630KeELBHdxrmnHBGyN9wWCf2pRKAF7Tv/7ZvKE09wxP6L+e4je Tqr4lim3lX79zzC8O9p3n8oac1VLsxZowf8uSEaOu77u9yu5nK1b+axt5OXugZsY XK7N/ovvV8KKZxoBPPcEb79k+NuWAJJgGdVXVWxlqXPQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=j1ecP1 hS1+8Q03M6Gsq1GRA0IViW6Ff/YHj+DMZE51U=; b=Mroc8BBDw/qTN4oYFJy9wk GKOaPBSdgRxD0OIwlDTVHNL2jHQ+Zm7nqz6IDylijkjWLeEgoFhMR11Pj6z2jGrh B23DL4qCj2kxVpapcHZ18Qqzbt6vDrfk5BDcZLF+JMQtfteq24qBCK7FWK7rkaCg JeImi6FuCGcUWgNvYBawEPuqyq3l1hd3gJdFaqmPaS9WRLdmjWAQ8zzfgEf7kfWu HrQfRYaXD5/e7mgk6k+kgKH69PVUp38aVaNsa1gsLoHWDJouWE9ak7wWUInrXUzo lvtTGc3+nQq4rnXHT4fGPUHfQoSP1YCl1kNbBE7v2Y7Q2LRY+6UVo+t+4srL9M9g == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddriedugdehkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghsthhm rghilhdrtghomheqnecukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgv rhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 3F3A11030F for ; Mon, 18 Mar 2019 09:55:38 -0400 (EDT) From: Marius Bakke Date: Mon, 18 Mar 2019 14:55:36 +0100 Message-Id: <20190318135536.5274-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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): Add #:disallowed-references. --- guix/build-system/meson.scm | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 8d49020454..3156f06b94 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Peter Mikkelsen -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -109,9 +109,25 @@ (system (%current-system)) (imported-modules %meson-build-system-modules) (modules '((guix build meson-build-system) - (guix build utils)))) + (guix build utils))) + + disallowed-references) "Build SOURCE using MESON, and with INPUTS, assuming that SOURCE has a 'meson.build' file." + + ;; TODO: Copied from build-system/gnu, factorize this! + (define canonicalize-reference + (match-lambda + ((? package? p) + (derivation->output-path (package-derivation store p system + #:graft? #f))) + (((? package? p) output) + (derivation->output-path (package-derivation store p system + #:graft? #f) + output)) + ((? string? output) + output))) + (define builder `(let ((build-phases (if ,glib-or-gtk? ,phases @@ -159,7 +175,11 @@ has a 'meson.build' file." #:inputs inputs #:modules imported-modules #:outputs outputs - #:guile-for-build guile-for-build)) + #:guile-for-build guile-for-build + #:disallowed-references + (and disallowed-references + (map canonicalize-reference + disallowed-references)))) (define meson-build-system (build-system