[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/26: Add powerpc64le-linux as a supported Guix architecture.
From: |
guix-commits |
Subject: |
13/26: Add powerpc64le-linux as a supported Guix architecture. |
Date: |
Sun, 7 Mar 2021 22:00:16 -0500 (EST) |
marusich pushed a commit to branch wip-ppc64le
in repository guix.
commit 32d9fb09aa4e19456ff1cdbef608e5bd6a3414a0
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Sat Feb 20 17:29:58 2021 -0800
Add powerpc64le-linux as a supported Guix architecture.
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 5c24618..82e95e8 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.
#
@@ -798,7 +799,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 94c04aa..c84e7b7 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 67ef6ea..460e666 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -348,7 +349,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 c1ce087..f0d85a2 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 b7602e6..e20702c 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>.
- 05/26: gnu: binutils-final: Support more Power architectures., (continued)
- 05/26: gnu: binutils-final: Support more Power architectures., guix-commits, 2021/03/07
- 06/26: gnu: gcc-4.7: On powerpc64le, fix /lib64 references., guix-commits, 2021/03/07
- 09/26: gnu: guile-avahi: Fix compilation on powerpc64le-linux., guix-commits, 2021/03/07
- 11/26: gnu: texlive-latex-base: Fix compilation on powerpc64le*., guix-commits, 2021/03/07
- 12/26: gnu: libelf: Fix compilation for powerpc64le-linux., guix-commits, 2021/03/07
- 15/26: syscalls: Fix RNDADDTOENTCNT on powerpc64le-linux., guix-commits, 2021/03/07
- 23/26: gnu: openjpeg: Disable failing tests group., guix-commits, 2021/03/07
- 24/26: gnu: rust: Make it "supported" on all systems but i686-linux., guix-commits, 2021/03/07
- 25/26: tests: guix-environment.sh: Use C_INCLUDE_PATH, not CPATH., guix-commits, 2021/03/07
- 10/26: gnu: texlive-bin: Fix compilation on powerpc64le*., guix-commits, 2021/03/07
- 13/26: Add powerpc64le-linux as a supported Guix architecture.,
guix-commits <=
- 14/26: syscalls: Fix clone on powerpc64le-linux., guix-commits, 2021/03/07
- 16/26: ci: %cross-targets: Add powerpc64le-linux-gnu., guix-commits, 2021/03/07
- 17/26: utils: Fix target-64bit? on powerpc64le-linux., guix-commits, 2021/03/07
- 18/26: tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty., guix-commits, 2021/03/07
- 19/26: tests: pack: Fix %gzip-compressor and a failing test., guix-commits, 2021/03/07
- 20/26: gnu: commencement: Fix findutils-boot0 on some systems., guix-commits, 2021/03/07
- 21/26: gnu: gcc: Set gcc-8 as default., guix-commits, 2021/03/07
- 22/26: .guix-authorizations: Add lle_bout., guix-commits, 2021/03/07
- 26/26: gnu: emacs: Use librsvg and gtk+ on x86_64-linux only., guix-commits, 2021/03/07