From patchwork Sat Dec 30 16:38:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58221 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 99C3C27BBEA; Sat, 30 Dec 2023 16:39:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E995C27BBE2 for ; Sat, 30 Dec 2023 16:39:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMa-00075Z-5P; Sat, 30 Dec 2023 11:39:04 -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 1rJcMY-00074p-3T for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -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 1rJcMX-0008QL-Rp for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMY-0002ET-EX for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH 1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.17039543338518 (code B ref 68150); Sat, 30 Dec 2023 16:39:02 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:38:53 +0000 Received: from localhost ([127.0.0.1]:44955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJcMP-0002DF-9L for submit@debbugs.gnu.org; Sat, 30 Dec 2023 11:38:53 -0500 Received: from wolfsden.cz ([37.205.8.62]:38676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJcML-0002CK-Qx for 68150@debbugs.gnu.org; Sat, 30 Dec 2023 11:38:51 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 057FB278AC7; Sat, 30 Dec 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954328; bh=gHSutvC0eRKoQoXUagk8wSUz9F/tGh4XsdzT1wZqAlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fLSKVlQWLG7KksR9l40aJnu8EtUbPkmVZiPhrSSSxuFPOagzmKhAI7wUvWykjhEfn QaDh3N8yA39vF4afJFXm2SK6NZCBNuslAR86Nu7KSoXJWTNSXQOLb7Vp0GnAinPp2F KY74rMzC+YvjKHCdsD180EHPIOetl1tnlpgTOdcVXMBUaq7SQuoSb/kI4FfiIGWk6R 24HcaLNaO7+nH5ZxcTVmzvZsg15R8TPba9MXineCXg7gInqNjkrqglqIErAkoQNdc2 0b7I3xs+nuUrlt3DaXIQxNsoqv/phAZPmz9K4vZSI6prkbYYxSpTZgkWfaXz5uCeMj Kt1bZGAVLWIw5PsXOsx1PU7wDFS6cnljv5zrSDsniLbjpGLKTuDjG673jlzX7T7i6t /PEJi4ro+8mKcz3jFoUuS2UmoXOyBdSOhwNnUR+3nP83KYOoDWuvlUb8tKx87bTImK yWqMV6Gb+inep7pF+mRrrqpZ7u20aQ/88qya0FsVi2zuFX4tt1fSmuA3TF+CbdlEhY dn86FJ1KlZRvqEg4TgkSGJjpMJxGrGIwpYEzetcDPfHgBl9YkDiSbQuJqdvI0SO0Pv TjVeImHC8nRLr72sSivUuNKKn2mgPBKe6zGCONTFuStF/9q9OpALK+6MDR6xXVHFf/ viz/tAauSl+4uy3SNi51A6to= Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id 3B8B52776D0; Sat, 30 Dec 2023 16:38:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954327; bh=gHSutvC0eRKoQoXUagk8wSUz9F/tGh4XsdzT1wZqAlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lVBo5/Bs8cSWcyNUoHLBU7sYv0upHNyqvtFhVnIVPFc0icA1La7sltH5b6NMYRefv 7IVZTMAYfPn4zl/fF+97Yj+nz259NkTkEiHkqh8YcWhVfzokr7VGwlomQrWSYv2oz6 Ha39KgUvM2ZPXJ49zxSvbfQ9AutO2SlmV64znN2N6qkHZJVwVDq8so3bG3Vft0QUyP si09mtmjqX+5I3+zOFnUy1qRGltjPJ76B8mcKyOKD0y5TiIhOrXM74sTDF5Em9czRQ D8sOset27U/jCNuvg6MVQeEYyy+RL7cFnd3Xrt9GnbFLjBR58j52yx1983e2BeSK/R QlQOuhHVOXynxl/mu98wNcTPPD42fwPN9fUB/TBYkSV6AT1tAwLdI5l+yubokT0ooB XLe8lKPY53xgGPkKgwvHZZSuH2txnokMw0cSdcqzPWgUIjgPhFltjikNfhIDwAf2F2 kEDc1Oh5Te8Hwtk11t2F9aTudm7eji7KzzCYpenAnbgVibvFVXGuFZ1XUk3fvYuqd7 b1/qFX3jXKsnNh3xws62JjRkrXEtbbqmuXNTIfCjsrWOgVLcvYp9H+0G6WZPh/d/PO egvnzadL3FYeX1e2Vuqi9/FDDo2LdjwJZA1LzlJ8C14BY8O3T0onq6bguTRrA14wEF 574GBuuWjxQO6XS6evkUf0dQ= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 717c2e1c; Sat, 30 Dec 2023 16:38:46 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:35 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The list of modules used by default was not public, so users of this build system had to pick between copy&pasting the list, or using %glib-or-gtk-build-system-modules. The former is sub-optimal, since it is hard to keep it in sync. The latter is just wrong and leads to basically fall-backing to gnu-build-system. The solution is to export the default list giving the users option to use it directly. * guix/build-system/glib-or-gtk.scm (%glib-or-gtk-build-system-default-modules): Renamed from %default-modules. (define-module): Export it. (glib-or-gtk-build), (glib-or-gtk-cross-build): Use it. Change-Id: I331b2a3f0bdc3ce14eb9f2f80605e7873369168d --- guix/build-system/glib-or-gtk.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 726d19efad..38a6eeb178 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -30,7 +30,8 @@ (define-module (guix build-system glib-or-gtk) #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:export (%glib-or-gtk-build-system-modules + #:export (%glib-or-gtk-build-system-default-modules + %glib-or-gtk-build-system-modules glib-or-gtk-build glib-or-gtk-cross-build glib-or-gtk-build-system) @@ -64,7 +65,7 @@ (define-module (guix build-system glib-or-gtk) ;; ;; Code: -(define %default-modules +(define %glib-or-gtk-build-system-default-modules ;; Build-side modules made available in the build environment. '((guix build glib-or-gtk-build-system) (guix build utils))) @@ -144,7 +145,7 @@ (define* (glib-or-gtk-build name inputs (glib-or-gtk-wrap-excluded-outputs ''()) (system (%current-system)) (imported-modules %glib-or-gtk-build-system-modules) - (modules %default-modules) + (modules %glib-or-gtk-build-system-default-modules) allowed-references disallowed-references) "Build SOURCE with INPUTS. See GNU-BUILD for more details." @@ -219,7 +220,7 @@ (define* (glib-or-gtk-cross-build name (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %glib-or-gtk-build-system-modules) - (modules %default-modules) + (modules %glib-or-gtk-build-system-default-modules) allowed-references disallowed-references) "Cross-build SOURCE with INPUTS. See GNU-BUILD for more details."