From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manolis Ragkousis Subject: [PATCH 1/2] gnu: glibc-hurd: Update to 20160518. Date: Thu, 2 Jun 2016 13:29:57 +0300 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------87898F8D052F5CC7CDDCE557" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8PtB-0002vV-CF for guix-devel@gnu.org; Thu, 02 Jun 2016 06:30:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8Pt8-0007jO-La for guix-devel@gnu.org; Thu, 02 Jun 2016 06:30:08 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------87898F8D052F5CC7CDDCE557 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Hello, This patch applies to core-updates. It updates glibc/hurd and applies some changes from wip-hurd. Manolis --------------87898F8D052F5CC7CDDCE557 Content-Type: text/x-patch; name="0001-gnu-glibc-hurd-Update-to-20160518.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-glibc-hurd-Update-to-20160518.patch" =46rom 909a495b76fef64e6c1b4ff5bc82bb1ba41a5d9b Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis 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= =2E [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=3D" 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"))= )) =20 ;; Libc provides , which includes a bunch of Hurd and Mach h= eaders, ;; 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-prepar= ation.patch")) ("mig" ,mig) - ("perl" ,perl) - ("libpthread" ,(origin - (method git-fetch) - (uri (git-reference - (url "git://git.sv.gnu.org/hurd/libpthread= ") - (commit "0ef7b75c4ba91b6660f0d3d8b51d14d25= e3d5bfb"))) - (sha256 - (base32 - "031py18fls15z0wprni33mf762kg6fx8xqijppimhp83y= p6ky3l3")) - (file-name "libpthread"))))) + ("perl" ,perl))) =20 (arguments (substitute-keyword-arguments (package-arguments glibc) - ((#:configure-flags original-configure-flags) - `(append (list "--host=3Di686-pc-gnu" + ((#:phases original-phases) + ;; Add libmachuser.so and libhurduser.so to libc.so's search pat= h. + ;; See . + `(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=3Di586-pc-gnu" + + ;; We need this to get a working openpty() functi= on. + "--enable-pt_chown" =20 ;; nscd fails to build for GNU/Hurd: ;; . ;; Disable it. "--disable-nscd") (filter (lambda (flag) - (not (or (string-prefix? "--with-headers=3D" = flag) - (string-prefix? "--enable-kernel=3D"= flag)))) - ;; Evaluate 'original-configure-flags' in a - ;; lexical environment that has a dummy - ;; "linux-headers" input, to prevent errors. - (let ((%build-inputs `(("linux-headers" . "@DUM= MY@") - ,@%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") "libpthrea= d") - - (system* "patch" "--force" "-p1" "-i" - (assoc-ref inputs "patch/libpthread-patch")) - #t) - ,phases)))) + (not (string-prefix? "--enable-kernel=3D" fla= g))) + ,original-configure-flags))))) (synopsis "The GNU C Library (GNU Hurd variant)") (supported-systems %hurd-systems))) =20 --=20 2.8.2 --------------87898F8D052F5CC7CDDCE557--