* [PATCH 1/2] gnu: glibc-hurd: Update to 20160518.
@ 2016-06-02 10:29 Manolis Ragkousis
2016-06-04 21:20 ` Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Manolis Ragkousis @ 2016-06-02 10:29 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 115 bytes --]
Hello,
This patch applies to core-updates. It updates glibc/hurd and applies
some changes from wip-hurd.
Manolis
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-glibc-hurd-Update-to-20160518.patch --]
[-- Type: text/x-patch; name="0001-gnu-glibc-hurd-Update-to-20160518.patch", Size: 5659 bytes --]
From 909a495b76fef64e6c1b4ff5bc82bb1ba41a5d9b Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Thu, 2 Jun 2016 12:36:05 +0300
Subject: [PATCH 1/2] gnu: glibc-hurd: Update to 20160518.
* gnu/packages/base.scm (glibc/hurd)[version]: Update to version 20160518.
[propagated-inputs]: Use hurd-core-headers.
[native-inputs]: Remove libpthread from inputs.
[arguments]: Add augment-libc.so and pre-configure-set-pwd phases.
Remove prepare-libpthread phase. Stop removing "--with-headers="
from original-configure-flags.
---
gnu/packages/base.scm | 74 ++++++++++++++++++++++-----------------------------
1 file changed, 32 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f5da787..b7ab7f1 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -761,66 +761,56 @@ command.")
;; The Hurd's libc variant.
(package (inherit glibc)
(name "glibc-hurd")
- (version "2.18")
+ (version "2.19")
(source (origin
- (method git-fetch)
- (uri (git-reference
- (url "git://git.sv.gnu.org/hurd/glibc")
- (commit "cc94b3cfe65523f980359e5f0e93a26196bda1d3")))
+ (method url-fetch)
+ (uri (string-append "http://alpha.gnu.org/gnu/hurd/glibc-"
+ version "-hurd+libpthread-20160518" ".tar.gz"))
(sha256
(base32
- "17gsh0kaz0zyvghjmx861mi2p65m9901lngi179x61zm6v2v3xc4"))
- (file-name (string-append name "-" version))
- (patches (search-patches "glibc-hurd-extern-inline.patch"))))
+ "12zmdjviybpsdb2kq4cg98rds7909f0cc96fzdahdfrzlxx1q0px"))))
;; Libc provides <hurd.h>, which includes a bunch of Hurd and Mach headers,
;; so both should be propagated.
- (propagated-inputs `(("gnumach-headers" ,gnumach-headers)
- ("hurd-headers" ,hurd-headers)
- ("hurd-minimal" ,hurd-minimal)))
+ (propagated-inputs `(("hurd-core-headers" ,hurd-core-headers)))
(native-inputs
`(,@(package-native-inputs glibc)
- ("patch/libpthread-patch" ,(search-patch "libpthread-glibc-preparation.patch"))
("mig" ,mig)
- ("perl" ,perl)
- ("libpthread" ,(origin
- (method git-fetch)
- (uri (git-reference
- (url "git://git.sv.gnu.org/hurd/libpthread")
- (commit "0ef7b75c4ba91b6660f0d3d8b51d14d25e3d5bfb")))
- (sha256
- (base32
- "031py18fls15z0wprni33mf762kg6fx8xqijppimhp83yp6ky3l3"))
- (file-name "libpthread")))))
+ ("perl" ,perl)))
(arguments
(substitute-keyword-arguments (package-arguments glibc)
- ((#:configure-flags original-configure-flags)
- `(append (list "--host=i686-pc-gnu"
+ ((#:phases original-phases)
+ ;; Add libmachuser.so and libhurduser.so to libc.so's search path.
+ ;; See <http://lists.gnu.org/archive/html/bug-hurd/2015-07/msg00051.html>.
+ `(alist-cons-after
+ 'install 'augment-libc.so
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (substitute* (string-append out "/lib/libc.so")
+ (("/[^ ]+/lib/libc.so.0.3")
+ (string-append out "/lib/libc.so.0.3" " libmachuser.so" " libhurduser.so"))))
+ #t)
+ (alist-cons-after
+ 'pre-configure 'pre-configure-set-pwd
+ (lambda _
+ ;; Use the right 'pwd'.
+ (substitute* "configure"
+ (("/bin/pwd") "pwd")))
+ ,original-phases)))
+ ((#:configure-flags original-configure-flags)
+ `(append (list "--host=i586-pc-gnu"
+
+ ;; We need this to get a working openpty() function.
+ "--enable-pt_chown"
;; nscd fails to build for GNU/Hurd:
;; <https://lists.gnu.org/archive/html/bug-hurd/2014-07/msg00006.html>.
;; Disable it.
"--disable-nscd")
(filter (lambda (flag)
- (not (or (string-prefix? "--with-headers=" flag)
- (string-prefix? "--enable-kernel=" flag))))
- ;; Evaluate 'original-configure-flags' in a
- ;; lexical environment that has a dummy
- ;; "linux-headers" input, to prevent errors.
- (let ((%build-inputs `(("linux-headers" . "@DUMMY@")
- ,@%build-inputs)))
- ,original-configure-flags))))
- ((#:phases phases)
- `(alist-cons-after
- 'unpack 'prepare-libpthread
- (lambda* (#:key inputs #:allow-other-keys)
- (copy-recursively (assoc-ref inputs "libpthread") "libpthread")
-
- (system* "patch" "--force" "-p1" "-i"
- (assoc-ref inputs "patch/libpthread-patch"))
- #t)
- ,phases))))
+ (not (string-prefix? "--enable-kernel=" flag)))
+ ,original-configure-flags)))))
(synopsis "The GNU C Library (GNU Hurd variant)")
(supported-systems %hurd-systems)))
--
2.8.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] gnu: glibc-hurd: Update to 20160518.
2016-06-02 10:29 [PATCH 1/2] gnu: glibc-hurd: Update to 20160518 Manolis Ragkousis
@ 2016-06-04 21:20 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2016-06-04 21:20 UTC (permalink / raw)
To: Manolis Ragkousis; +Cc: guix-devel
Manolis Ragkousis <manolis837@gmail.com> skribis:
> From 909a495b76fef64e6c1b4ff5bc82bb1ba41a5d9b Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Thu, 2 Jun 2016 12:36:05 +0300
> Subject: [PATCH 1/2] gnu: glibc-hurd: Update to 20160518.
>
> * gnu/packages/base.scm (glibc/hurd)[version]: Update to version 20160518.
> [propagated-inputs]: Use hurd-core-headers.
> [native-inputs]: Remove libpthread from inputs.
^
“Remove libpthread’s source and ‘patch/libpthread-patch’.”
> [arguments]: Add augment-libc.so and pre-configure-set-pwd phases.
> Remove prepare-libpthread phase. Stop removing "--with-headers="
> from original-configure-flags.
Otherwise LGTM. OK for ‘core-updates’!
> + (alist-cons-after
> + 'pre-configure 'pre-configure-set-pwd
> + (lambda _
> + ;; Use the right 'pwd'.
> + (substitute* "configure"
> + (("/bin/pwd") "pwd")))
FYI, this ‘pwd’ issue was fixed in glibc 2.23, which is why this phase
was removed in ‘core-updates’.
Thank you!
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-04 21:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-02 10:29 [PATCH 1/2] gnu: glibc-hurd: Update to 20160518 Manolis Ragkousis
2016-06-04 21:20 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.