me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Chris Marusich 2021-02-20 17:29:58 -08:00
parent b50f426803
commit a16eb6c5f9
No known key found for this signature in database
GPG Key ID: DD409A15D822469D
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -14,6 +14,7 @@
# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> # Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
# Copyright © 2018 Alex Vong <alexvong1995@gmail.com> # Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> # Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@ -799,7 +800,8 @@ SOURCE_TARBALLS = \
$(foreach ext,tar.gz,$(PACKAGE_FULL_TARNAME).$(ext)) $(foreach ext,tar.gz,$(PACKAGE_FULL_TARNAME).$(ext))
# Systems supported by Guix. # 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. # Guix binary tarballs.
BINARY_TARBALLS = \ BINARY_TARBALLS = \

4
etc/guix-install.sh
View File

@ -8,6 +8,7 @@
# Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com> # Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
# Copyright © 2020 Daniel Brooks <db48x@db48x.net> # Copyright © 2020 Daniel Brooks <db48x@db48x.net>
# Copyright © 2021 Jakub Kądziołka <kuba@kadziolka.net> # Copyright © 2021 Jakub Kądziołka <kuba@kadziolka.net>
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@ -187,6 +188,9 @@ chk_sys_arch()
armv7l) armv7l)
local arch=armhf local arch=armhf
;; ;;
ppc64le | powerpc64le)
local arch=powerpc64le
;;
*) *)
_err "${ERR}Unsupported CPU type: ${arch}" _err "${ERR}Unsupported CPU type: ${arch}"
exit 1 exit 1

4
guix/packages.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -345,7 +346,8 @@ name of its URI."
(define %supported-systems (define %supported-systems
;; This is the list of system types that are supported. By default, we ;; This is the list of system types that are supported. By default, we
;; expect all packages to build successfully here. ;; 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 (define %hurd-systems
;; The GNU/Hurd systems for which support is being developed. ;; The GNU/Hurd systems for which support is being developed.

3
m4/guix.m4
View File

@ -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 © 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 © 2014 Mark H Weaver <mhw@netris.org>
dnl Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> dnl Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
dnl Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
dnl dnl
dnl This file is part of GNU Guix. dnl This file is part of GNU Guix.
dnl 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 # Currently only Linux-based systems are supported, and only on some
# platforms. # platforms.
case "$guix_system" in 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 if test "x$guix_courageous" = "xyes"; then

6
tests/guix-build.sh
View File

@ -1,6 +1,7 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> # Copyright © 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2020 Marius Bakke <mbakke@fastmail.com> # Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
# #
# This file is part of GNU Guix. # 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 test `guix build sed -s x86_64-linux -d | wc -l` = 1
# Passing multiple '-s' flags. # Passing multiple '-s' flags.
all_systems="-s x86_64-linux -s i686-linux -s armhf-linux -s aarch64-linux" 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 -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. # Check there's no weird memoization effect leading to erroneous results.
# See <https://bugs.gnu.org/40482>. # See <https://bugs.gnu.org/40482>.