diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-02-09 09:15:36 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-05-23 22:23:18 +0300 |
| commit | cbdb7d4fea928febc105985c03b8fb5d6eda3d27 (patch) | |
| tree | b054204c835b074a0b62ccf82a2cd2eba3ac058c | |
| parent | 0de7945dc47612286ef080315a5a78f019b161b6 (diff) | |
gnu: bootstrap: Add support for powerpc-linux.
On 923bb70a1bff657125c3008f119a477e5cb57c2b
gnu:glibc-for-bootstrap: Fix patch.
Run
./pre-inst-env guix build --target=powerpc-linux-gnu bootstrap-tarballs
Producing
/gnu/store/dyj1wvayyp1ihaknkxniz1xamcf4yrhl-bootstrap-tarballs-0
With guix hash -rx /gnu/store/dyj1wvayyp1ihaknkxniz1xamcf4yrhl-bootstrap-tarballs-0
02xx2ydj28pwv3vflqffinpq1icj09gzi9icm8j4bwc4lca9irxn
* gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for
powerpc-linux.
(%bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils,
%bootstrap-glibc, %bootstrap-gcc): Add entry for powerpc-linux.
* gnu/packages.scm (%supported-systems): Add powerpc-linux.
(%hydra-supported-systems): Remove powerpc-linux.
* m4/guix.m4: Add powerpc-linux as a supported system.
| -rw-r--r-- | gnu/packages/bootstrap.scm | 37 | ||||
| -rw-r--r-- | guix/packages.scm | 4 | ||||
| -rw-r--r-- | m4/guix.m4 | 4 |
3 files changed, 40 insertions, 5 deletions
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c8844a40a8f..5a8028a4652 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm | |||
| @@ -91,6 +91,15 @@ | |||
| 91 | ,(base32 "1j51gv08sfg277yxj73xd564wjq3f8xwd6s9rbcg8v9gms47m4cx")) | 91 | ,(base32 "1j51gv08sfg277yxj73xd564wjq3f8xwd6s9rbcg8v9gms47m4cx")) |
| 92 | ("xz" | 92 | ("xz" |
| 93 | ,(base32 "1d779rwsrasphg5g3r37qppcqy3p7ay1jb1y83w7x4i3qsc7zjy2"))) | 93 | ,(base32 "1d779rwsrasphg5g3r37qppcqy3p7ay1jb1y83w7x4i3qsc7zjy2"))) |
| 94 | ("powerpc-linux" | ||
| 95 | ("bash" | ||
| 96 | ,(base32 "0hwlw5lcyjzadprf5fm0cv4zb6jw667g9amnmhq0lbixasy7j72j")) | ||
| 97 | ("mkdir" | ||
| 98 | ,(base32 "12lfwh5p8pp06250wgi9mdvjv1jdfpd5xpmvfc0616aj0xqh09hp")) | ||
| 99 | ("tar" | ||
| 100 | ,(base32 "00sbmwl8qh6alxv9mw4hvj1j4yipwmw5mrw6qad8bi2pr7ya5386")) | ||
| 101 | ("xz" | ||
| 102 | ,(base32 "0hi47y6zh5zz137i59l5ibw92x6g54zn7ris1b1ym9rvavsasg7b"))) | ||
| 94 | ("armhf-linux" | 103 | ("armhf-linux" |
| 95 | ("bash" | 104 | ("bash" |
| 96 | ,(base32 "0s6f1s26g4dsrrkl39zblvwpxmbzi6n9mgqf6vxsqz42gik6bgyn")) | 105 | ,(base32 "0s6f1s26g4dsrrkl39zblvwpxmbzi6n9mgqf6vxsqz42gik6bgyn")) |
| @@ -141,6 +150,7 @@ | |||
| 141 | ;; This is where the bootstrap executables come from. | 150 | ;; This is where the bootstrap executables come from. |
| 142 | '("https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/" | 151 | '("https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/" |
| 143 | "https://alpha.gnu.org/gnu/guix/bootstrap/" | 152 | "https://alpha.gnu.org/gnu/guix/bootstrap/" |
| 153 | "http://flashner.co.il/guix/bootstrap/" | ||
| 144 | "http://lilypond.org/janneke/guix/")) | 154 | "http://lilypond.org/janneke/guix/")) |
| 145 | 155 | ||
| 146 | (define (bootstrap-executable-file-name system program) | 156 | (define (bootstrap-executable-file-name system program) |
| @@ -148,6 +158,7 @@ | |||
| 148 | (match system | 158 | (match system |
| 149 | ("powerpc64le-linux" (string-append system "/20210106/" program)) | 159 | ("powerpc64le-linux" (string-append system "/20210106/" program)) |
| 150 | ("i586-gnu" (string-append system "/20200326/" program)) | 160 | ("i586-gnu" (string-append system "/20200326/" program)) |
| 161 | ("powerpc-linux" (string-append system "/20200923/bin/" program)) | ||
| 151 | (_ (string-append system "/" program | 162 | (_ (string-append system "/" program |
| 152 | "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")))) | 163 | "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")))) |
| 153 | 164 | ||
| @@ -343,6 +354,8 @@ or false to signal an error." | |||
| 343 | (match system | 354 | (match system |
| 344 | ("aarch64-linux" | 355 | ("aarch64-linux" |
| 345 | "/20170217/guile-2.0.14.tar.xz") | 356 | "/20170217/guile-2.0.14.tar.xz") |
| 357 | ("powerpc-linux" | ||
| 358 | "/20200923/guile-2.0.14.tar.xz") | ||
| 346 | ("armhf-linux" | 359 | ("armhf-linux" |
| 347 | "/20150101/guile-2.0.11.tar.xz") | 360 | "/20150101/guile-2.0.11.tar.xz") |
| 348 | ("i586-gnu" | 361 | ("i586-gnu" |
| @@ -368,7 +381,9 @@ or false to signal an error." | |||
| 368 | ("aarch64-linux" | 381 | ("aarch64-linux" |
| 369 | (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")) | 382 | (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")) |
| 370 | ("i586-gnu" | 383 | ("i586-gnu" |
| 371 | (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac")))) | 384 | (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac")) |
| 385 | ("powerpc-linux" | ||
| 386 | (base32 "1by2p7s27fbyjzfkcw8h65h4kkqh7d23kv4sgg5jppjn2qx7swq4")))) | ||
| 372 | 387 | ||
| 373 | (define (bootstrap-guile-origin system) | 388 | (define (bootstrap-guile-origin system) |
| 374 | "Return an <origin> object for the Guile tarball of SYSTEM." | 389 | "Return an <origin> object for the Guile tarball of SYSTEM." |
| @@ -501,6 +516,8 @@ $out/bin/guile --version~%" | |||
| 501 | "/20210106/static-binaries-0-powerpc64le-linux-gnu.tar.xz") | 516 | "/20210106/static-binaries-0-powerpc64le-linux-gnu.tar.xz") |
| 502 | ("i586-gnu" | 517 | ("i586-gnu" |
| 503 | "/20200326/static-binaries-0-i586-pc-gnu.tar.xz") | 518 | "/20200326/static-binaries-0-i586-pc-gnu.tar.xz") |
| 519 | ("powerpc-linux" | ||
| 520 | "/20200923/static-binaries.tar.xz") | ||
| 504 | (_ | 521 | (_ |
| 505 | "/20131110/static-binaries.tar.xz"))) | 522 | "/20131110/static-binaries.tar.xz"))) |
| 506 | %bootstrap-base-urls)) | 523 | %bootstrap-base-urls)) |
| @@ -524,6 +541,9 @@ $out/bin/guile --version~%" | |||
| 524 | ("i586-gnu" | 541 | ("i586-gnu" |
| 525 | (base32 | 542 | (base32 |
| 526 | "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")) | 543 | "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")) |
| 544 | ("powerpc-linux" | ||
| 545 | (base32 | ||
| 546 | "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m")) | ||
| 527 | ("mips64el-linux" | 547 | ("mips64el-linux" |
| 528 | (base32 | 548 | (base32 |
| 529 | "072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753")))))) | 549 | "072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753")))))) |
| @@ -574,6 +594,8 @@ $out/bin/guile --version~%" | |||
| 574 | "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz") | 594 | "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz") |
| 575 | ("i586-gnu" | 595 | ("i586-gnu" |
| 576 | "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz") | 596 | "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz") |
| 597 | ("powerpc-linux" | ||
| 598 | "/20200923/binutils-2.35.1.tar.xz") | ||
| 577 | (_ | 599 | (_ |
| 578 | "/20131110/binutils-2.23.2.tar.xz"))) | 600 | "/20131110/binutils-2.23.2.tar.xz"))) |
| 579 | %bootstrap-base-urls)) | 601 | %bootstrap-base-urls)) |
| @@ -597,6 +619,9 @@ $out/bin/guile --version~%" | |||
| 597 | ("i586-gnu" | 619 | ("i586-gnu" |
| 598 | (base32 | 620 | (base32 |
| 599 | "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")) | 621 | "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")) |
| 622 | ("powerpc-linux" | ||
| 623 | (base32 | ||
| 624 | "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8")) | ||
| 600 | ("mips64el-linux" | 625 | ("mips64el-linux" |
| 601 | (base32 | 626 | (base32 |
| 602 | "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7")))))) | 627 | "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7")))))) |
| @@ -654,6 +679,8 @@ $out/bin/guile --version~%" | |||
| 654 | "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz") | 679 | "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz") |
| 655 | ("i586-gnu" | 680 | ("i586-gnu" |
| 656 | "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz") | 681 | "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz") |
| 682 | ("powerpc-linux" | ||
| 683 | "/20200923/glibc-2.32.tar.xz") | ||
| 657 | (_ | 684 | (_ |
| 658 | "/20131110/glibc-2.18.tar.xz"))) | 685 | "/20131110/glibc-2.18.tar.xz"))) |
| 659 | %bootstrap-base-urls)) | 686 | %bootstrap-base-urls)) |
| @@ -677,6 +704,9 @@ $out/bin/guile --version~%" | |||
| 677 | ("i586-gnu" | 704 | ("i586-gnu" |
| 678 | (base32 | 705 | (base32 |
| 679 | "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952")) | 706 | "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952")) |
| 707 | ("powerpc-linux" | ||
| 708 | (base32 | ||
| 709 | "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")) | ||
| 680 | ("mips64el-linux" | 710 | ("mips64el-linux" |
| 681 | (base32 | 711 | (base32 |
| 682 | "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg"))))))))) | 712 | "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg"))))))))) |
| @@ -750,6 +780,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ | |||
| 750 | "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz") | 780 | "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz") |
| 751 | ("i586-gnu" | 781 | ("i586-gnu" |
| 752 | "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz") | 782 | "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz") |
| 783 | ("powerpc-linux" | ||
| 784 | "/20200923/gcc-5.5.0.tar.xz") | ||
| 753 | (_ | 785 | (_ |
| 754 | "/20131110/gcc-4.8.2.tar.xz"))) | 786 | "/20131110/gcc-4.8.2.tar.xz"))) |
| 755 | %bootstrap-base-urls)) | 787 | %bootstrap-base-urls)) |
| @@ -773,6 +805,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ | |||
| 773 | ("i586-gnu" | 805 | ("i586-gnu" |
| 774 | (base32 | 806 | (base32 |
| 775 | "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")) | 807 | "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")) |
| 808 | ("powerpc-linux" | ||
| 809 | (base32 | ||
| 810 | "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rfmirq7w")) | ||
| 776 | ("mips64el-linux" | 811 | ("mips64el-linux" |
| 777 | (base32 | 812 | (base32 |
| 778 | "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) | 813 | "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) |
diff --git a/guix/packages.scm b/guix/packages.scm index ba191746461..a66dbea1b7c 100644 --- a/guix/packages.scm +++ b/guix/packages.scm | |||
| @@ -353,7 +353,7 @@ name of its URI." | |||
| 353 | ;; This is the list of system types that are supported. By default, we | 353 | ;; This is the list of system types that are supported. By default, we |
| 354 | ;; expect all packages to build successfully here. | 354 | ;; expect all packages to build successfully here. |
| 355 | '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux" "i586-gnu" | 355 | '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux" "i586-gnu" |
| 356 | "powerpc64le-linux")) | 356 | "powerpc64le-linux" "powerpc-linux")) |
| 357 | 357 | ||
| 358 | (define %hurd-systems | 358 | (define %hurd-systems |
| 359 | ;; The GNU/Hurd systems for which support is being developed. | 359 | ;; The GNU/Hurd systems for which support is being developed. |
| @@ -364,7 +364,7 @@ name of its URI." | |||
| 364 | ;; | 364 | ;; |
| 365 | ;; XXX: MIPS is unavailable in CI: | 365 | ;; XXX: MIPS is unavailable in CI: |
| 366 | ;; <https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00790.html>. | 366 | ;; <https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00790.html>. |
| 367 | (fold delete %supported-systems '("mips64el-linux"))) | 367 | (fold delete %supported-systems '("mips64el-linux" "powerpc-linux"))) |
| 368 | 368 | ||
| 369 | 369 | ||
| 370 | ;; A package. | 370 | ;; A package. |
diff --git a/m4/guix.m4 b/m4/guix.m4 index 05d409a6745..e778a560042 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | dnl GNU Guix --- Functional package management for GNU | 1 | dnl GNU Guix --- Functional package management for GNU |
| 2 | dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> | 2 | dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> |
| 3 | dnl Copyright © 2014 Mark H Weaver <mhw@netris.org> | 3 | dnl Copyright © 2014 Mark H Weaver <mhw@netris.org> |
| 4 | dnl Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> | 4 | dnl Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il> |
| 5 | dnl Copyright © 2021 Chris Marusich <cmmarusich@gmail.com> | 5 | dnl Copyright © 2021 Chris Marusich <cmmarusich@gmail.com> |
| 6 | dnl | 6 | dnl |
| 7 | dnl This file is part of GNU Guix. | 7 | dnl This file is part of GNU Guix. |
| @@ -89,7 +89,7 @@ courageous and port the GNU System distribution to it (see | |||
| 89 | # Currently only Linux-based systems are supported, and only on some | 89 | # Currently only Linux-based systems are supported, and only on some |
| 90 | # platforms. | 90 | # platforms. |
| 91 | case "$guix_system" in | 91 | case "$guix_system" in |
| 92 | x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux) | 92 | x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux|powerpc-linux) |
| 93 | ;; | 93 | ;; |
| 94 | *) | 94 | *) |
| 95 | if test "x$guix_courageous" = "xyes"; then | 95 | if test "x$guix_courageous" = "xyes"; then |
