From patchwork Wed Feb 1 20:25:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 46567 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 14C0827BBED; Wed, 1 Feb 2023 20:26:29 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 16E1C27BBE9 for ; Wed, 1 Feb 2023 20:26:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNJgD-0001Ov-AP; Wed, 01 Feb 2023 15:26:05 -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 1pNJgA-0001Om-QW for guix-patches@gnu.org; Wed, 01 Feb 2023 15:26:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNJgA-0003Z2-IH for guix-patches@gnu.org; Wed, 01 Feb 2023 15:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNJgA-0001N4-3y for guix-patches@gnu.org; Wed, 01 Feb 2023 15:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61217] [PATCH] build: Correct guix_system on musl libc distros. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Feb 2023 20:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61217 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61217@debbugs.gnu.org Cc: Antero Mejr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16752831315228 (code B ref -1); Wed, 01 Feb 2023 20:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Feb 2023 20:25:31 +0000 Received: from localhost ([127.0.0.1]:59940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNJff-0001MG-5X for submit@debbugs.gnu.org; Wed, 01 Feb 2023 15:25:31 -0500 Received: from lists.gnu.org ([209.51.188.17]:36266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNJfb-0001M6-LZ for submit@debbugs.gnu.org; Wed, 01 Feb 2023 15:25:30 -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 1pNJfa-0000mi-9m for guix-patches@gnu.org; Wed, 01 Feb 2023 15:25:26 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pNJfY-0003KI-4S for guix-patches@gnu.org; Wed, 01 Feb 2023 15:25:26 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4P6YM14wwtz9slq for ; Wed, 1 Feb 2023 21:25:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1675283117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jYFweSymgp7o4tivVjlgZ7Z9zj7WfXGOuqyRAil/ZLs=; b=gMw17G0PGjGNEjCys6T0VKBHqNtqk4lZUX8755xN5dVhtD1OE3oad4s5HX0NX1jb+fo727 wBbzeAzQRFHfViDdIHGePxUuZ0s7NyMSfDtB7cK/SoTjv5IPQmnRAROEWI6ATe6GK/GPIP sffkfUYeRrOIX7vRpHjgK/75jsuVrSB6qNL287HeMfqFjE8Rlbg/kFsAKkSWJM7rG+I3al Vs+FU4tyZVd1ECDuc4F/QzUS6F7Ze31+j51eYIyRvmSKKwHbNJdm3kd8RNwkL1aBN698OO BUbDwR5M94tXJ5deNkwcyFFheMCEFFBcPZcAuO6OnA252rxj9QLeAORKzc9wHA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1675283115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jYFweSymgp7o4tivVjlgZ7Z9zj7WfXGOuqyRAil/ZLs=; b=KzNCwA6TVpn6zsWZnIF0hUoZq80BWpx+QPankLOuaLJFtzlYi3sAfF3K8nr3CCo5WBNefx 1+b9mvwLeXZLDF84KN/FcwJOhjCkRUHZcr3qk7jtgs3Z3g21P5LtvZIgmqVLhSUJWArEe0 r0o2JEQr+u8UCBrdbJXyvcrxAyxCP343jHY9mHK7oSAvcs/+N/WN6EQaBx2rYmCEwV17MN uvaSlGNDvv1X0YVwg7lq3ZqaPWd17vnm3aKMRS/wZmFWGSajiaJ4wRUIHsz320I7EJw3jV nnMI1HFQhWnSkaNaWz2gWgu+G6EEJurLb8ypDVmftNg/hsA/keH1Or+nL54E8g== Date: Wed, 1 Feb 2023 20:25:04 +0000 Message-Id: <20230201202504.14546-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: a540f2ce84abac0ebee X-MBO-RS-META: ziafcwnhkbiidq9h7za4sx6gynhk4wte Received-SPF: pass client-ip=80.241.56.171; envelope-from=antero@mailbox.org; helo=mout-p-201.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=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: , Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr 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 * m4/guix.m4 (GUIX_SYSTEM_TYPE): Add linux-musl* case. This prevents the macro from mis-parsing the host OS, which causes breakage when building from source. --- m4/guix.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/m4/guix.m4 b/m4/guix.m4 index 700c0dfd4a..147fcc48f4 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -58,6 +58,8 @@ AC_DEFUN([GUIX_SYSTEM_TYPE], [ linux-gnu*) # For backward compatibility, strip the `-gnu' part. guix_system="$machine_name-linux";; + linux-musl*) + guix_system="$machine_name-linux";; gnu*) # Always use i586 for GNU/Hurd. guix_system="i586-gnu";;