Re: [PATCH] gnu: Add glibc-hurd-headers

[Manolis Ragkousis <manolis837@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 19 bytes --]

The updated patch.

[-- Attachment #2: gnu_add_glibc_hurd_headers.patch --]
[-- Type: text/x-patch, Size: 3615 bytes --]

From 4f78389df586fd15c84248fe96743b4fb308edea Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Tue, 15 Apr 2014 16:54:46 +0000
Subject: [PATCH] gnu: Add glibc-hurd-headers.

* gnu/packages/base.scm (glibc/hurd-headers): New variable.
---
 gnu/packages/base.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e6a2242..2656faf 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -32,10 +32,12 @@
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages hurd)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages pkg-config)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module (guix utils)
@@ -508,6 +510,63 @@ with the Linux kernel.")
    (license lgpl2.0+)
    (home-page "http://www.gnu.org/software/libc/")))
 
+(define-public glibc/hurd-headers
+  (package (inherit glibc)
+           (name "glibc-hurd-headers")
+           (version "2.18")
+           (source (origin
+                     (method git-fetch)
+                     (uri (git-reference
+                           (url "git://git.sv.gnu.org/hurd/glibc")
+                           (commit "14258ada6a678171a59b1e095863e83b47f9d21c")))
+                     (sha256
+                      (base32
+                       "016x7fz5500rlgwxi9dpwm6971c3xl3jkgllgjfk5s5czwvx5yh2"))
+                     (file-name (string-append name "-" version))
+                     (patches (list (search-patch "glibc-make-4.0.patch")))))
+
+           (propagated-inputs `(("gnumach-headers" ,gnumach-headers)
+                                ("hurd-headers" ,hurd-headers)))
+           (native-inputs `(("mig" ,mig)
+                            ("perl" ,perl)))
+
+           (outputs '("out"))
+
+           (arguments
+            `(#:strip-binaries? #f
+              #:out-of-source? #t
+              #:tests? #f
+              #:configure-flags
+              (list "--host=i686-pc-gnu"
+                    "--enable-addons"
+
+                    ;; Installs NIS and RPC related headers that
+                    ;; are not installed by default
+                    "--enable-obsolete-rpc"
+
+                    (string-append "--with-headers="
+                                   (assoc-ref %build-inputs "gnumach-headers")
+                                   "/include:"
+                                   (assoc-ref %build-inputs "hurd-headers")
+                                   "/include")
+
+                    ;; Use our Bash instead of /bin/sh.
+                    (string-append "BASH_SHELL="
+                                   (assoc-ref %build-inputs "bash")
+                                   "/bin/bash"))
+              #:phases (alist-replace
+                        'install
+                        (lambda _
+                          (zero? (system* "make" "install-headers")))
+                        (alist-delete
+                         'build
+                         (alist-cons-before
+                          'configure 'pre-configure
+                          (lambda _
+                            (substitute* "configure"
+                              (("/bin/pwd") "pwd")))
+                          %standard-phases)))))))
+
 (define-public tzdata
   (package
     (name "tzdata")
-- 
1.9.0