From patchwork Tue Feb 22 11:14:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 37398 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 2DAF627BBEA; Tue, 22 Feb 2022 11:17:04 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable 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 CCDE927BBE9 for ; Tue, 22 Feb 2022 11:17:03 +0000 (GMT) Received: from localhost ([::1]:47032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMTAE-0006dr-Tv for patchwork@mira.cbaines.net; Tue, 22 Feb 2022 06:17:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMT9G-00066N-Lc for guix-patches@gnu.org; Tue, 22 Feb 2022 06:16:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46255) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMT9G-00061n-An for guix-patches@gnu.org; Tue, 22 Feb 2022 06:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nMT9F-0005Ms-PS for guix-patches@gnu.org; Tue, 22 Feb 2022 06:16:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54106] [PATCH] guix: packages: Add %32bit-supported-systems, %64bit-supported-systems. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Feb 2022 11:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54106@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164552852520570 (code B ref -1); Tue, 22 Feb 2022 11:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Feb 2022 11:15:25 +0000 Received: from localhost ([127.0.0.1]:40149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMT8e-0005Li-My for submit@debbugs.gnu.org; Tue, 22 Feb 2022 06:15:25 -0500 Received: from lists.gnu.org ([209.51.188.17]:52300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMT8c-0005La-Fk for submit@debbugs.gnu.org; Tue, 22 Feb 2022 06:15:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMT8Z-0005Cp-Tz for guix-patches@gnu.org; Tue, 22 Feb 2022 06:15:21 -0500 Received: from flashner.co.il ([178.62.234.194]:38792) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMT8X-0005sS-DM for guix-patches@gnu.org; Tue, 22 Feb 2022 06:15:19 -0500 Received: from localhost (unknown [31.210.181.166]) by flashner.co.il (Postfix) with ESMTPSA id 0D56B402D4; Tue, 22 Feb 2022 11:15:15 +0000 (UTC) From: Efraim Flashner Date: Tue, 22 Feb 2022 13:14:43 +0200 Message-Id: <6d2a5c7f72606293bb76ebb3e80d0b42634db21e.1645528396.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Received-SPF: pass client-ip=178.62.234.194; envelope-from=efraim@flashner.co.il; helo=flashner.co.il X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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/packages.scm (%32bit-supported-systems, %64bit-supported-systems): New variables. (%supported-systems): Rewrite using %32bit-supported-systems, %64bit-supported-systems. --- This allows us to do things like declare a package only supports 64-bit architectures, by adding: (supported-systems %64bit-supported-systems) instead of enumerating them specifically or removing them specifically. guix/packages.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) base-commit: e4779e061056b1a3a3ab56ef817353d86c482611 diff --git a/guix/packages.scm b/guix/packages.scm index 3f0262602d..e2a5a58b8d 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2017, 2018, 2019 Mark H Weaver ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Alex Kost -;;; Copyright © 2017, 2019, 2020 Efraim Flashner +;;; Copyright © 2017, 2019, 2020, 2022 Efraim Flashner ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021 Chris Marusich @@ -148,6 +148,8 @@ (define-module (guix packages) transitive-input-references + %32bit-supported-systems + %64bit-supported-systems %supported-systems %hurd-systems %cuirass-supported-systems @@ -391,11 +393,19 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:guile-for-build guile))) +(define %32bit-supported-systems + ;; This is the list of 32-bit system types that are supported. + '("i686-linux" "armhf-linux" "i586-gnu" "powerpc-linux")) + +(define %64bit-supported-systems + ;; This is the list of 64-bit system types that are supported. + '("x86_64-linux" "mips64el-linux" "aarch64-lixux" "powerpc64le-linux" + "riscv64-linux")) + (define %supported-systems ;; This is the list of system types that are supported. By default, we ;; expect all packages to build successfully here. - '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux" "i586-gnu" - "powerpc64le-linux" "powerpc-linux" "riscv64-linux")) + (append %32bit-supported-systems %64bit-supported-systems)) (define %hurd-systems ;; The GNU/Hurd systems for which support is being developed.