From d950f038483a2e553fdbd01e6058ca1626629dfb Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Mon, 19 Dec 2016 11:55:39 +0200 Subject: gnu: gnumach-headers: Update to 1.8. * gnu/packages/hurd.scm (gnumach-headers): Update to version 1.8. --- gnu/packages/hurd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/hurd.scm') diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index a4c0296b04..376021bf97 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -33,7 +33,7 @@ (define-module (gnu packages hurd) (define-public gnumach-headers (package (name "gnumach-headers") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) @@ -41,7 +41,7 @@ (define-public gnumach-headers version ".tar.gz")) (sha256 (base32 - "1vd0bykshf6ilr55792b5lf6yd5ywlkp1wqz00dcsx7fq3rfadz2")))) + "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f")))) (build-system gnu-build-system) (arguments `(#:phases (alist-replace -- cgit v1.2.3 From 9c9402be2e971db5d49ecb1bc4be67af8ca97a95 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Mon, 19 Dec 2016 11:57:41 +0200 Subject: gnu: mig: Update to 1.8. * gnu/packages/hurd.scm (mig): Update to version 1.8. --- gnu/packages/hurd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/hurd.scm') diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 376021bf97..08868808c7 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -71,7 +71,7 @@ (define-public gnumach-headers (define-public mig (package (name "mig") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) @@ -79,7 +79,7 @@ (define-public mig version ".tar.gz")) (sha256 (base32 - "1hxqd8p14pgamgavmbmziswvd1zvwqx7lgc9qga805q9jrs93q2b")))) + "1gyda8sq6b379nx01hkpbd85lz39irdvz2b9wbr63gicicx8i706")))) (build-system gnu-build-system) ;; Flex is needed both at build and run time. (inputs `(("gnumach-headers" ,gnumach-headers) -- cgit v1.2.3 From be6a70edc20ad570ec7511581bf109c73bfd87a8 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Mon, 19 Dec 2016 11:58:57 +0200 Subject: gnu: hurd-headers: Update to 0.9. * gnu/packages/hurd.scm (hurd-headers): Update to version 0.9. --- gnu/packages/hurd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/hurd.scm') diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 08868808c7..3b79eab3d6 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -102,14 +102,14 @@ (define-public mig (define-public hurd-headers (package (name "hurd-headers") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/hurd/hurd-" version ".tar.gz")) (sha256 (base32 - "1pbc4aqgzxvkgivw80ghp3w755cl0fwxmg357vq7chimj64jk78d")))) + "1nw9gly0n7pyv3cpfm4mmxy4yccrx4g0lyrvd3vk2vil26jpbggw")))) (build-system gnu-build-system) (native-inputs `(("mig" ,mig))) -- cgit v1.2.3 From 62596a158b4878e3f4b64f3e0f3a3f846228afd4 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Mon, 2 Jan 2017 21:07:59 +0200 Subject: gnu: Use hurd-triplet? to check if GNU/Hurd. * gnu/packages/make-bootstrap.scm (hurd-triplet?): Move it from here.. * gnu/packages/hurd.scm: ..to here. New exported procedure. * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash) [arguments]: Replace string-match. [inputs]: Same. * gnu/packages/cross-base.scm (cross-libc)[native-inputs]: Same. --- gnu/packages/commencement.scm | 4 ++-- gnu/packages/cross-base.scm | 2 +- gnu/packages/hurd.scm | 7 ++++++- gnu/packages/make-bootstrap.scm | 4 ---- 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages/hurd.scm') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c7aa59e9a2..7df1d3fca9 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -474,7 +474,7 @@ (define glibc-final-with-bootstrap-bash (unsetenv "CPATH") ;; Tell 'libpthread' where to find 'libihash' on Hurd systems. - ,@(if (string-match "i586-gnu" (%current-system)) + ,@(if (hurd-triplet? (%current-system)) `((substitute* "libpthread/Makefile" (("LDLIBS-pthread.so =.*") (string-append "LDLIBS-pthread.so = " @@ -499,7 +499,7 @@ (define glibc-final-with-bootstrap-bash ,@%boot1-inputs ;; A native MiG is needed to build Glibc on Hurd. - ,@(if (string-match "i586-gnu" (%current-system)) + ,@(if (hurd-triplet? (%current-system)) `(("mig" ,mig-boot0)) '()) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 763bbf50e2..a3dfb8f477 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -468,7 +468,7 @@ (define (cross-libc-for-target target) (native-inputs `(("cross-gcc" ,xgcc) ("cross-binutils" ,xbinutils) - ,@(if (string-match (or "i586-pc-gnu" "i586-gnu") target) + ,@(if (hurd-triplet? target) `(("cross-mig" ,@(assoc-ref (package-native-inputs xheaders) "cross-mig"))) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 3b79eab3d6..557091d055 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -28,7 +28,12 @@ (define-module (gnu packages hurd) #:use-module (gnu packages bison) #:use-module (gnu packages perl) #:use-module (gnu packages base) - #:use-module (guix git-download)) + #:use-module (guix git-download) + #:export (hurd-triplet?)) + +(define (hurd-triplet? triplet) + (and (string-suffix? "-gnu" triplet) + (not (string-contains triplet "linux")))) (define-public gnumach-headers (package diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 44a7fd3a16..e5c614cee7 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -337,10 +337,6 @@ (define (%glibc-stripped) ;; GNU libc's essential shared libraries, dynamic linker, and headers, ;; with all references to store directories stripped. As a result, ;; libc.so is unusable and need to be patched for proper relocation. - (define (hurd-triplet? triplet) - (and (string-suffix? "-gnu" triplet) - (not (string-contains triplet "linux")))) - (let ((glibc (glibc-for-bootstrap))) (package (inherit glibc) (name "glibc-stripped") -- cgit v1.2.3