guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

09/31: gnu: bootstrap: Add support for the Hurd.


From: guix-commits
Subject: 09/31: gnu: bootstrap: Add support for the Hurd.
Date: Sun, 15 Mar 2020 14:23:09 -0400 (EDT)

janneke pushed a commit to branch wip-hurd
in repository guix.

commit ceeff082b5b3529a44b138ac313581390004f945
Author: Efraim Flashner <address@hidden>
AuthorDate: Fri Jan 31 16:28:23 2020 +0200

    gnu: bootstrap: Add support for the Hurd.
    
    On 7d169751b3e2fc76a7338b5c1a7101aa3d23b2d5 gnu: bootstrap: gcc-static: Use 
gcc-5.
    
    Run
        ./pre-inst-env guix build --target=i586-pc-gnu bootstrap-tarballs 
--verbosity=1
    
    Producing
    
         /gnu/store/i3agx788cjcqkbbxy0yz9gmg13md2xkc-bootstrap-tarballs-0
    
    * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for the
    Hurd.
    (bootstrap-executable-url): Use lilypond url for the Hurd.
    (bootstrap-guile-url-path): Likewise.
    (bootstrap-guile-hash): Add entry for the Hurd.
    (%bootstrap-coreutils&co): Likewise.
    (%bootstrap-binutils): Likewise.
    (%bootstrap-glibc): Likewise.
    (%bootstrap-gcc): Likewise.
    * guix/packages.scm (%supported-systems): Add i586-gnu.
    
    Co-authored-by: Jan Nieuwenhuizen <address@hidden>
---
 gnu/packages/bootstrap.scm | 50 +++++++++++++++++++++++++++++++++++++++-------
 guix/packages.scm          |  4 ++--
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 0fbe8ef..726944f 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -1,8 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver <address@hidden>
-;;; Copyright © 2017 Efraim Flashner <address@hidden>
-;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <address@hidden>
+;;; Copyright © 2017, 2020 Efraim Flashner <address@hidden>
+;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
 ;;; Copyright © 2019 Carl Dong <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -104,6 +104,15 @@
       ,(base32 "07830bx29ad5i0l1ykj0g0b1jayjdblf01sr3ww9wbnwdbzinqms"))
      ("xz"
       ,(base32 "0i9kxdi17bm5gxfi2xzm0y73p3ii0cqxli1sbljm6rh2fjgyn90k")))
+    ("i586-gnu"
+     ("bash"
+      ,(base32 "1as8649aqaibahhhrvkj10ci8shpi4hq5n7gnik8rhhy0dc1jarg"))
+     ("mkdir"
+      ,(base32 "1snqgpfrl00hfn82lm29jqylzjsfb9jd6ha74dp12phwb8fpbmb9"))
+     ("tar"
+      ,(base32 "0nq2c1zb3wv5bf7kd83sziaashydazrn7xgq6kijlk0zj2syzc2m"))
+     ("xz"
+      ,(base32 "033rhpk6zrpxpd6ffjyg5y2zwq9x9cnq0zljb7k8jlncbalsayq5")))
     ("mips64el-linux"
      ("bash"
       ,(base32 "1aw046dhda240k9pb9iaj5aqkm23gkvxa9j82n4k7fk87nbrixw6"))
@@ -116,10 +125,13 @@
 
 (define (bootstrap-executable-url program system)
   "Return the URL where PROGRAM can be found for SYSTEM."
-  (string-append
-   "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/";
-   system "/" program
-   "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e"))
+  (if (equal? (or (%current-target-system) (%current-system)) "i586-gnu")
+      (string-append
+       "http://lilypond.org/janneke/guix/i586-gnu/20200315/"; program)
+      (string-append
+       
"https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/";
+       system "/" program
+       "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")))
 
 (define bootstrap-executable
   (mlambda (program system)
@@ -312,6 +324,8 @@ or false to signal an error."
                     "/20170217/guile-2.0.14.tar.xz")
                    ("armhf-linux"
                     "/20150101/guile-2.0.11.tar.xz")
+                   ("i586-gnu"
+                    
"/20200315/guile-static-stripped-2.0.14-i586-pc-gnu.tar.xz")
                    (_
                     "/20131110/guile-2.0.9.tar.xz"))))
 
@@ -327,7 +341,9 @@ or false to signal an error."
     ("armhf-linux"
      (base32 "1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5"))
     ("aarch64-linux"
-     (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r"))))
+     (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r"))
+    ("i586-gnu"
+     (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac"))))
 
 (define (bootstrap-guile-origin system)
   "Return an <origin> object for the Guile tarball of SYSTEM."
@@ -457,6 +473,8 @@ $out/bin/guile --version~%"
                                              
"/20150101/static-binaries.tar.xz")
                                             ("aarch64-linux"
                                              
"/20170217/static-binaries.tar.xz")
+                                            ("i586-gnu"
+                                             
"/20200315/static-binaries-0-i586-pc-gnu.tar.xz")
                                             (_
                                              
"/20131110/static-binaries.tar.xz")))
                                      %bootstrap-base-urls))
@@ -474,6 +492,9 @@ $out/bin/guile --version~%"
                               ("aarch64-linux"
                                (base32
                                 
"18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh"))
+                              ("i586-gnu"
+                               (base32
+                                
"17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn"))
                               ("mips64el-linux"
                                (base32
                                 
"072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753"))))))
@@ -520,6 +541,8 @@ $out/bin/guile --version~%"
                                              "/20150101/binutils-2.25.tar.xz")
                                             ("aarch64-linux"
                                              "/20170217/binutils-2.27.tar.xz")
+                                            ("i586-gnu"
+                                             
"/20200315/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz")
                                             (_
                                              
"/20131110/binutils-2.23.2.tar.xz")))
                                      %bootstrap-base-urls))
@@ -537,6 +560,9 @@ $out/bin/guile --version~%"
                               ("aarch64-linux"
                                (base32
                                 
"111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n"))
+                              ("i586-gnu"
+                               (base32
+                                
"11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs"))
                               ("mips64el-linux"
                                (base32
                                 
"1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7"))))))
@@ -590,6 +616,8 @@ $out/bin/guile --version~%"
                                        "/20150101/glibc-2.20.tar.xz")
                                       ("aarch64-linux"
                                        "/20170217/glibc-2.25.tar.xz")
+                                      ("i586-gnu"
+                                       
"/20200315/glibc-stripped-2.31-i586-pc-gnu.tar.xz")
                                       (_
                                        "/20131110/glibc-2.18.tar.xz")))
                                %bootstrap-base-urls))
@@ -607,6 +635,9 @@ $out/bin/guile --version~%"
                         ("aarch64-linux"
                          (base32
                           
"07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c"))
+                        ("i586-gnu"
+                         (base32
+                          
"15vxl6z1zsc1zlj38mgnsfixlphqc2bi76fj3z3z575kbva27xjb"))
                         ("mips64el-linux"
                          (base32
                           
"0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg")))))))))
@@ -676,6 +707,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
                                         "/20150101/gcc-4.8.4.tar.xz")
                                        ("aarch64-linux"
                                         "/20170217/gcc-5.4.0.tar.xz")
+                                       ("i586-gnu"
+                                        
"/20200315/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz")
                                        (_
                                         "/20131110/gcc-4.8.2.tar.xz")))
                                 %bootstrap-base-urls))
@@ -693,6 +726,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
                          ("aarch64-linux"
                           (base32
                            
"1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1"))
+                         ("i586-gnu"
+                          (base32
+                           
"0ck9by98cbrss5l3c78q183hjni9lg7dih652z89lp5pb6dp969r"))
                          ("mips64el-linux"
                           (base32
                            
"1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks")))))))))
diff --git a/guix/packages.scm b/guix/packages.scm
index d925e75..f24e0b2 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2014, 2015, 2017, 2018 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Eric Bavier <address@hidden>
 ;;; Copyright © 2016 Alex Kost <address@hidden>
-;;; Copyright © 2017, 2019 Efraim Flashner <address@hidden>
+;;; Copyright © 2017, 2019, 2020 Efraim Flashner <address@hidden>
 ;;; Copyright © 2019 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -232,7 +232,7 @@ 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"))
+  '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux" 
"i586-gnu"))
 
 (define %hurd-systems
   ;; The GNU/Hurd systems for which support is being developed.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]