From: Chris Marusich <cmmarusich@gmail.com>
To: 47182@debbugs.gnu.org
Cc: Chris Marusich <cmmarusich@gmail.com>
Subject: [bug#47182] [PATCH 13/18] Add powerpc64le-linux as a supported Guix architecture.
Date: Mon, 15 Mar 2021 23:45:06 -0700 [thread overview]
Message-ID: <20210316064511.2891553-13-cmmarusich@gmail.com> (raw)
In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com>
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 <go.wigust@gmail.com>
# Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
#
# 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 <zimon.toutoune@gmail.com>
# Copyright © 2020 Daniel Brooks <db48x@db48x.net>
# Copyright © 2021 Jakub Kądziołka <kuba@kadziolka.net>
+# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
#
# 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 <alezost@gmail.com>
;;; Copyright © 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;;
;;; 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 <ludo@gnu.org>
dnl Copyright © 2014 Mark H Weaver <mhw@netris.org>
dnl Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+dnl Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
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 <ludo@gnu.org>
# Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
#
# 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 <https://bugs.gnu.org/40482>.
--
2.26.2
next prev parent reply other threads:[~2021-03-16 6:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 6:28 [bug#47182] [PATCH 00/18] Add support for powerpc64le-linux (wip-ppc64le-for-master) Chris Marusich
2021-03-16 6:44 ` [bug#47182] [PATCH 01/18] gnu: bootstrap: Add support for powerpc64le-linux Chris Marusich
2021-03-16 6:44 ` [bug#47182] [PATCH 02/18] utils: Add target-powerpc? procedure Chris Marusich
2021-03-16 6:44 ` [bug#47182] [PATCH 03/18] gnu: gcc-4.7: On powerpc64le, fix /lib64 references Chris Marusich
2021-03-16 6:44 ` [bug#47182] [PATCH 04/18] gnu: glibc: Fix ldd path on powerpc* Chris Marusich
2021-03-16 7:45 ` Efraim Flashner
2021-03-16 6:44 ` [bug#47182] [PATCH 05/18] gnu: gcc-boot0: Enable 128-bit long double for POWER9 Chris Marusich
2021-03-16 6:44 ` [bug#47182] [PATCH 06/18] gnu: binutils-final: Provide bash for binary on powerpc-linux Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 07/18] gnu: binutils-final: Support more Power architectures Chris Marusich
2021-03-16 7:49 ` Efraim Flashner
2021-03-18 6:10 ` [bug#47182] [PATCH 00/18] Add support for powerpc64le-linux (wip-ppc64le-for-master) Chris Marusich
2021-03-18 8:29 ` Efraim Flashner
2021-03-16 6:45 ` [bug#47182] [PATCH 08/18] gnu: bdb-4.8: Fix configure on powerpc64le-linux Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 09/18] gnu: guile-avahi: Fix compilation " Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 10/18] gnu: texlive-bin: Fix compilation on powerpc64le* Chris Marusich
2021-03-16 7:53 ` Efraim Flashner
2021-03-18 6:16 ` [bug#47182] [PATCH 00/18] Add support for powerpc64le-linux (wip-ppc64le-for-master) Chris Marusich
2021-03-18 8:34 ` Efraim Flashner
2021-03-19 6:22 ` Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 11/18] gnu: texlive-latex-base: Fix compilation on powerpc64le* Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 12/18] gnu: libelf: Fix compilation for powerpc64le-linux Chris Marusich
2021-03-16 6:45 ` Chris Marusich [this message]
2021-03-16 6:45 ` [bug#47182] [PATCH 14/18] syscalls: Fix clone on powerpc64le-linux Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 15/18] syscalls: Fix RNDADDTOENTCNT " Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 16/18] ci: %cross-targets: Add powerpc64le-linux-gnu Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 17/18] utils: Fix target-64bit? on powerpc64le-linux Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 18/18] gnu: sed: Make it build on SELinux-enabled kernels Chris Marusich
2021-03-16 8:30 ` [bug#47182] [PATCH 01/18] gnu: bootstrap: Add support for powerpc64le-linux Chris Marusich
2021-03-16 9:33 ` [bug#47182] [PATCH 00/18] Add support for powerpc64le-linux (wip-ppc64le-for-master) Léo Le Bouter via Guix-patches via
2021-03-17 6:58 ` Chris Marusich
2021-03-17 20:33 ` Christopher Baines
2021-03-18 6:08 ` Chris Marusich
2021-03-24 6:36 ` bug#47182: Merged to master Chris Marusich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210316064511.2891553-13-cmmarusich@gmail.com \
--to=cmmarusich@gmail.com \
--cc=47182@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).