summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-10-24 00:09:01 +0200
committerLudovic Courtès <ludo@gnu.org>2012-10-24 00:09:01 +0200
commitd398e2c2426cd50a97603b0be6da999e67947def (patch)
tree3e6966c35ed0c4366fcfd98c2c2c1a2de8d1a566
parent827a3087da2181a6570ab2c2d97c97124207a0e9 (diff)
downloadguix-d398e2c2426cd50a97603b0be6da999e67947def.tar.gz
distro: Update bootstrap glibc package.
* distro/packages/base.scm (%bootstrap-glibc): Update initial regexp to
  make it less Nixish.  Update hash to new tarball.
-rw-r--r--distro/packages/base.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/distro/packages/base.scm b/distro/packages/base.scm
index 6506553558..e2bb061dad 100644
--- a/distro/packages/base.scm
+++ b/distro/packages/base.scm
@@ -1543,8 +1543,8 @@ check whether everything is alright."
 
              ;; Patch libc.so so it refers to the right path.
              (substitute* "lib/libc.so"
-               (("/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-glibc([^/]+)/")
-                (string-append "/" (basename out) "/"))))))))
+               (("/[^ ]+/lib/(libc|ld)" _ prefix)
+                (string-append out "/lib/" prefix))))))))
     (inputs
      `(("tar" ,(lambda (system)
                  (search-bootstrap-binary "tar" system)))
@@ -1557,7 +1557,8 @@ check whether everything is alright."
                        (uri (string-append %bootstrap-base-url "/"
                                            system "/glibc-2.16.0.tar.xz"))
                        (sha256
-                        (base32 "1qbqmzjxsda74qmzl2rb7049iajary7lvznbym8m2xvqvyid8r2l"))))))))
+                        (base32
+                         "1xamrl1d6y3b0l98gmih4ac8aiqnfps1rhb62z0wxr7chisiqwan"))))))))
     (description "Bootstrap binaries and headers of the GNU C Library")
     (long-description #f)
     (home-page #f)))