From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id q1FeFeJUUGD7JwAA0tVLHw (envelope-from ) for ; Tue, 16 Mar 2021 06:49:06 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id MQrREOJUUGDFSwAAbx9fmQ (envelope-from ) for ; Tue, 16 Mar 2021 06:49:06 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8D72B22E25 for ; Tue, 16 Mar 2021 07:49:05 +0100 (CET) Received: from localhost ([::1]:57068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3Vo-00049l-OQ for larch@yhetil.org; Tue, 16 Mar 2021 02:49:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Us-0003Bk-KV for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Us-0005a1-AK for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Us-0001gB-8L for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 13/18] Add powerpc64le-linux as a supported Guix architecture. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772466300 (code B ref 47182); Tue, 16 Mar 2021 06:48:06 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:26 +0000 Received: from localhost ([127.0.0.1]:37920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3UB-0001dL-1P for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:26 -0400 Received: from mail-pl1-f170.google.com ([209.85.214.170]:45335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tw-0001ad-RD for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:09 -0400 Received: by mail-pl1-f170.google.com with SMTP id u18so16462816plc.12 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JxeS4ykx8M13NNPGaiBn3H7mUrjFA6EZUfNxxGq0Uzg=; b=XCsyX/k0MVavYTdTKw/lYY4fsLMpIRH93t6hktPj6n9DnIUCfVUwKvSijZUlWdGRXh +Z9qVOJjO3AU2Mtonz292TS1mCHZliC6Gz2IOFLLsi+xlKKSYdoovOSVsjPErNZ1JSeF xMq7oOY88j0DIDij2keuyP2Wth5pfUm2YdQfdnfWyXIBpI3XX0nz1N8a7F+UGtTFdipo yt34xupuTvkzbkWZNtWaapOk9VYNTfr0kP0W1Ljm/DN8OmR9oraleik03Uh8QMjm8IZy 2vlAmU2KXxEIyr0yTodN94lUviIrliz+ke8Sip6OlENa192N1xB2Yu7DpbaBhBxMlYZ7 j6xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JxeS4ykx8M13NNPGaiBn3H7mUrjFA6EZUfNxxGq0Uzg=; b=qd5tm8EwcMk0bQClTcangvcwwkeIcx9KWTtXs+iP+tK6Iw9skJAKvFAn/a33VPTi5t 43ds+kuNEgMwzJbEqvvie0h6UfgDYgCFhDREpiH/Jr/jKfPTi4FTqgKsFC/vTOqt0CeY UiBuuxzQFtKYFTjc9/t6Oru5bH3gM9dEm2E7V2hS48oIs3aX5C6MiXkZTgfOAPgWRGi4 OhxkYYryLTuDEUNYPA3CEAa2E8f8rNzlftX7lCwKJCBix+bNWQYD/r9+ZkcfguYHDvQL 2+Mb5VSS2tKOuLppppdyI9BnUNKNM7RVGP65DHoxikYGq9Q3K+ZL/dRVapS5VD1OSA+B ZSiw== X-Gm-Message-State: AOAM533myFB37QeRTVoywH/yO1qf2UaPq5XMECiKEjBKrCNzXPPvHPEM nCjJunVDB56AiP7K61MVEtFek+JKipBiGw== X-Google-Smtp-Source: ABdhPJwZ24y0JoaNoyKky+DU/4m4VsJhlWZPnnDNiY5h+nnccDX25bYArHTL0+7edfvv0AFqhfTz6A== X-Received: by 2002:a17:90a:ea91:: with SMTP id h17mr3320544pjz.66.1615877222621; Mon, 15 Mar 2021 23:47:02 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.47.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:47:02 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:06 -0700 Message-Id: <20210316064511.2891553-13-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615877345; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=JxeS4ykx8M13NNPGaiBn3H7mUrjFA6EZUfNxxGq0Uzg=; b=CwU5pJwgi6BQOK/75f0cbBpiJsvt+c6P3EsGWHs55HRJDj+eioBD6p5VKgWi3HfhEV0E3A LGUBzk6kiKIPLDYnyfc2PhYkYLF8HK0elGM0d9ZHXsCBCyQcGRCp8qsvNMGCvXdobM43Cu DcGnkKCiVhLrDN4YlIvL3+5dfNi5mK29TjZf42MIqhbyYbbnAviM4nZZjyH07jJnUhpTH0 JFa7z9JxQ6STiEvIgLUTDVdRGXu1bNmD7mP/yJ66WcHxSminW2xK/U/Ae4DtP0+ShLiBjd GK7DwdhEP75uMkQT/15FaaWAqrr3lR4arlOWcZlXdFJINva5hyiILUj1kURjDg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615877345; a=rsa-sha256; cv=none; b=dBd/pRogoQ9HuS/Ynwh6nI5y6zcRfRuhbhNTyUYKYUCrLlvkXUTcjfAh2bEJZz9pQLALVQ oy6obldPd4x5JncJhmOGgnHOwmspZc5QTxgS8gECIcz5Q+r2GdggQuNgps882Xyk1QlKTc m4odqJXj/aA2AIULjRfD9y6HD0KwEPRLuQhtkkbX7s0v751cTDuz8L6z7qUwWZ4AgmGHoQ B6YWrEiQRI1o8+ZYWZBijjGqUV7euH0twjp/W+pmstIxjF59qqhP1ol5/8ndKyv/QCbchZ t3UPSC327TJGuY/uYvttVF6dwfZqUur9a/XJjnGDu9OHnUhyv51yi7NNX6a7kw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b="XCsyX/k0"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b="XCsyX/k0"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8D72B22E25 X-Spam-Score: -0.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: Rf4wJ355LNpm This makes powerpc64le-linux a supported architecture for Guix, but not for Guix System. * Makefile.am (SUPPORTED_SYSTEMS): Add an entry for powerpc64le-linux. * etc/guix-install.sh (chk_sys_arch): Same. * guix/packages.scm (%supported-systems): Same. * m4/guix.m4 (GUIX_ASSERT_SUPPORTED_SYSTEM): Same. * tests/guix-build.sh (all_systems): Same. --- Makefile.am | 4 +++- etc/guix-install.sh | 4 ++++ guix/packages.scm | 4 +++- m4/guix.m4 | 3 ++- tests/guix-build.sh | 6 ++++-- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index f40d9509bee..1c2d45527c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,7 @@ # Copyright © 2018 Oleg Pykhalov # Copyright © 2018 Alex Vong # Copyright © 2019 Efraim Flashner +# Copyright © 2021 Chris Marusich # # This file is part of GNU Guix. # @@ -799,7 +800,8 @@ SOURCE_TARBALLS = \ $(foreach ext,tar.gz,$(PACKAGE_FULL_TARNAME).$(ext)) # Systems supported by Guix. -SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux +SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux \ + powerpc64le-linux # Guix binary tarballs. BINARY_TARBALLS = \ diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 94c04aa646a..c84e7b75779 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -8,6 +8,7 @@ # Copyright © 2020 Simon Tournier # Copyright © 2020 Daniel Brooks # Copyright © 2021 Jakub Kądziołka +# Copyright © 2021 Chris Marusich # # This file is part of GNU Guix. # @@ -187,6 +188,9 @@ chk_sys_arch() armv7l) local arch=armhf ;; + ppc64le | powerpc64le) + local arch=powerpc64le + ;; *) _err "${ERR}Unsupported CPU type: ${arch}" exit 1 diff --git a/guix/packages.scm b/guix/packages.scm index a057a88c638..55e5e70b8c6 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -345,7 +346,8 @@ name of its URI." (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")) + '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux" "i586-gnu" + "powerpc64le-linux")) (define %hurd-systems ;; The GNU/Hurd systems for which support is being developed. diff --git a/m4/guix.m4 b/m4/guix.m4 index c1ce0876fa0..f0d85a28d6d 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -2,6 +2,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 © 2021 Chris Marusich dnl dnl This file is part of GNU Guix. dnl @@ -88,7 +89,7 @@ courageous and port the GNU System distribution to it (see # 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) + x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux) ;; *) if test "x$guix_courageous" = "xyes"; then diff --git a/tests/guix-build.sh b/tests/guix-build.sh index b7602e668c4..e20702c521b 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès # Copyright © 2020 Marius Bakke +# Copyright © 2021 Chris Marusich # # This file is part of GNU Guix. # @@ -61,8 +62,9 @@ guix build -e '(@@ (gnu packages bootstrap) %bootstrap-guile)' test `guix build sed -s x86_64-linux -d | wc -l` = 1 # Passing multiple '-s' flags. -all_systems="-s x86_64-linux -s i686-linux -s armhf-linux -s aarch64-linux" -test `guix build sed $all_systems -d | sort -u | wc -l` = 4 +all_systems="-s x86_64-linux -s i686-linux -s armhf-linux -s aarch64-linux \ +-s powerpc64le-linux" +test `guix build sed $all_systems -d | sort -u | wc -l` = 5 # Check there's no weird memoization effect leading to erroneous results. # See . -- 2.26.2