unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Manolis Ragkousis <manolis837@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: Guix-devel@gnu.org
Subject: [PATCH] gnu: base: Add Hurd glibc headers.
Date: Tue, 22 Apr 2014 23:03:53 +0300	[thread overview]
Message-ID: <CAFtzXzMoCoQ1WeG2SmH+kA6uJr4bXBQmZUZEVYANwzKfbuNRsQ@mail.gmail.com> (raw)

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

This patch adds the glibc headers for hurd. It assumes that glibc/hurd exists.

Ludovic if I try to use

>      (zero? (system* "make"
>                      (string-append out "/include/gnu/stubs.h")))))

as you suggested, I am getting

>make[2]: *** No rule to make target '/tmp/nix-build-glibc-hurd-headers-cross-i686-pc-gnu-2.18.drv-9/build/elf/soinit.os', needed by '/tmp/nix-build-glibc-hurd-headers-cross-i686-pc-gnu-2.18.drv-9/build/libc.so'.  Stop.
>make[2]: Leaving directory '/tmp/nix-build-glibc-hurd-headers-cross-i686-pc-gnu-2.18.drv-9/glibc-hurd-2.18/mach'
>Makefile:233: recipe for target 'mach/subdir_install' failed
>make[1]: *** [mach/subdir_install] Error 2
>make[1]: Leaving directory '/tmp/nix-build-glibc-hurd-headers-cross-i686-pc-gnu-2.18.drv-9/glibc-hurd-2.18'
>Makefile:9: recipe for target '/gnu/store/dgf45yi11yn08fq8hm1cp49yqhyg0nl6-glibc-hurd-headers-cross-i686-pc-gnu-2.18/include/gnu/stubs.h' failed
>make: *** [/gnu/store/dgf45yi11yn08fq8hm1cp49yqhyg0nl6-glibc-hurd-headers-cross-i686-pc-gnu-2.18/include/gnu/stubs.h] Error 2

and it cannot be built. I am sending you the log as well so you can
see for yourself.

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

From 2105424303a99b0722d75145d3988b257af92058 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Tue, 22 Apr 2014 22:43:48 +0300
Subject: [PATCH] gnu: base: Add Hurd glibc headers.

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

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 09cbe89..cc5a697 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -508,6 +508,27 @@ with the Linux kernel.")
    (license lgpl2.0+)
    (home-page "http://www.gnu.org/software/libc/")))
 
+(define-public glibc/hurd-headers
+  (package (inherit glibc/hurd)
+    (name "glibc-hurd-headers")
+    (outputs `("out"))
+    (arguments
+     `(#:tests? #f
+       ,@(substitute-keyword-arguments (package-arguments glibc/hurd)
+           ((#: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.2


[-- Attachment #3: xjnd3jrfywgkrimyrv1kc973kr6j9m-glibc-hurd-headers-cross-i686-pc-gnu-2.18.drv.bz2 --]
[-- Type: application/x-bzip2, Size: 75467 bytes --]

             reply	other threads:[~2014-04-22 20:03 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-22 20:03 Manolis Ragkousis [this message]
2014-04-22 22:22 ` [PATCH] gnu: base: Add Hurd glibc headers Ludovic Courtès
2014-04-25 18:06   ` Manolis Ragkousis
2014-04-26  8:54     ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAFtzXzMoCoQ1WeG2SmH+kA6uJr4bXBQmZUZEVYANwzKfbuNRsQ@mail.gmail.com \
    --to=manolis837@gmail.com \
    --cc=Guix-devel@gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).