From patchwork Fri Sep 24 13:39:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 33271 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 8307827BBE3; Fri, 24 Sep 2021 14:42:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B223827BBE1 for ; Fri, 24 Sep 2021 14:42:18 +0100 (BST) Received: from localhost ([::1]:45274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTlSz-0005ZG-II for patchwork@mira.cbaines.net; Fri, 24 Sep 2021 09:42:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTlSk-0005XN-EK for guix-patches@gnu.org; Fri, 24 Sep 2021 09:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45439) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTlSj-0003XM-UJ for guix-patches@gnu.org; Fri, 24 Sep 2021 09:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mTlSj-0005Ld-Sh for guix-patches@gnu.org; Fri, 24 Sep 2021 09:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50778] [PATCH] m4: Don't require courage on unsupported systems. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Sep 2021 13:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50778 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50778@debbugs.gnu.org Cc: ludo@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163249089020488 (code B ref -1); Fri, 24 Sep 2021 13:42:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Sep 2021 13:41:30 +0000 Received: from localhost ([127.0.0.1]:56982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTlSE-0005KO-Ff for submit@debbugs.gnu.org; Fri, 24 Sep 2021 09:41:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:48002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTlSD-0005KG-31 for submit@debbugs.gnu.org; Fri, 24 Sep 2021 09:41:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTlSC-0004ve-SB for guix-patches@gnu.org; Fri, 24 Sep 2021 09:41:28 -0400 Received: from flashner.co.il ([178.62.234.194]:43334) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTlSB-0002mM-1p; Fri, 24 Sep 2021 09:41:28 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id AAFF040043; Fri, 24 Sep 2021 13:40:53 +0000 (UTC) Date: Fri, 24 Sep 2021 16:39:41 +0300 From: Efraim Flashner Message-ID: <6cef6643c809f73110b9d74db74c6511be000ee4.1632490595.git.efraim@flashner.co.il> Mail-Followup-To: guix-patches@gnu.org, ludo@gnu.org MIME-Version: 1.0 Content-Disposition: inline X-TUID: EJW3s77IDs4S 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 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 * m4/guix.m4 (GUIX_ASSERT_SUPPORTED_SYSTEM): Don't error if building on an unsupported system. * doc/guix.texi (GNU Distribution): Relabel mips64el-linux as unsupported. --- As we discussed previously with the powerpc-linux patches, I've gotten around to changing the m4 error to a warning. Also, I didn't change i586-gnu to say unsupported next to it in GNU Distribution in the manual, although I suppose the other option would be to add i586-gnu to supported in m4/guix.m4. --- doc/guix.texi | 2 +- m4/guix.m4 | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) base-commit: a7b6c5a1270e52385a70b4192ee40ac6eb3b7c27 diff --git a/doc/guix.texi b/doc/guix.texi index 9bb91b94fd..5cec6c0645 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -525,7 +525,7 @@ way for you to give it a try is by setting up an instance of (@pxref{transparent-emulation-qemu, @code{hurd-vm-service-type}}). @xref{Contributing}, on how to help! -@item mips64el-linux (deprecated) +@item mips64el-linux (unsupported) little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully supported; in particular, there is no ongoing work to ensure that this diff --git a/m4/guix.m4 b/m4/guix.m4 index 05d409a674..7a5eaa47f9 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -1,7 +1,7 @@ dnl GNU Guix --- Functional package management for GNU dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Ludovic Courtès dnl Copyright © 2014 Mark H Weaver -dnl Copyright © 2017 Efraim Flashner +dnl Copyright © 2017, 2021 Efraim Flashner dnl Copyright © 2021 Chris Marusich dnl dnl This file is part of GNU Guix. @@ -79,25 +79,14 @@ dnl Assert that this is a system to which the distro is ported. AC_DEFUN([GUIX_ASSERT_SUPPORTED_SYSTEM], [ AC_REQUIRE([GUIX_SYSTEM_TYPE]) - AC_ARG_WITH([courage], [AS_HELP_STRING([--with-courage], - [Assert that even if this platform is unsupported, you will be -courageous and port the GNU System distribution to it (see -"GNU Distribution" in the manual.)])], - [guix_courageous="$withval"], - [guix_courageous="no"]) - # Currently only Linux-based systems are supported, and only on some # platforms. case "$guix_system" in x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux) ;; *) - if test "x$guix_courageous" = "xyes"; then - AC_MSG_WARN([building Guix on `$guix_system', which is not supported]) - else - AC_MSG_ERROR([`$guix_system' is not a supported platform. -See "GNU Distribution" in the manual, or try `--with-courage'.]) - fi + AC_MSG_WARN([`$guix_system' IS NOT A SUPPORTED PLATFORM. +See "GNU Distribution" in the manual, for more information.]) ;; esac ])