From: Manolis Ragkousis <manolis837@gmail.com>
To: Guix-devel <Guix-devel@gnu.org>
Subject: Re: [PATCH 3/3] gnu: cross-base: Use cross-kernel-headers package in cross-gcc and cross-libc.
Date: Sat, 1 Aug 2015 12:35:31 +0300 [thread overview]
Message-ID: <CAFtzXzO2JCaGBRky_nHC1caGGdNreu4i1OsjJ6yH5S8FpFZbHg@mail.gmail.com> (raw)
In-Reply-To: <CAFtzXzOQGpVT-gBN7HgeVt8LSki1Z1nfjEAOVKgcioEZADzYVg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 15 bytes --]
Updated patch.
[-- Attachment #2: 0003-gnu-cross-base-Use-cross-kernel-headers-package-in-c.patch --]
[-- Type: text/x-patch, Size: 4194 bytes --]
From 767aacfbd5e9c5fdae44d6b44a49bbef323f355a Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Tue, 21 Jul 2015 12:08:18 +0300
Subject: [PATCH 3/3] gnu: cross-base: Use cross-kernel-headers package in
cross-gcc and cross-libc.
* gnu/packages/cross-base.scm (cross-gcc): Add cross-kernel-headers procedure
which return the headers needed for each kernel. Replace "xlinux-headers"
input with "xkernel-headers" input.
(cross-libc): Add "xkernel-headers" package. Replace Hurd's cross-libc propagated
inputs with "kernel-headers".
---
gnu/packages/cross-base.scm | 40 ++++++++++++++++++++++++++++------------
1 file changed, 28 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 2e4bd03..90cd12a 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -226,6 +226,15 @@ may be either a libc package or #f.)"
"Return a cross-compiler for TARGET, where TARGET is a GNU triplet. Use
XBINUTILS as the associated cross-Binutils. If LIBC is false, then build a
GCC that does not target a libc; otherwise, target that libc."
+
+ (define (cross-kernel-headers target libc)
+ "Return headers depending on TARGET."
+ (match target
+ ("i586-pc-gnu"
+ (assoc-ref (package-propagated-inputs libc) "kernel-headers"))
+ (_
+ (assoc-ref (package-propagated-inputs libc) "linux-headers"))))
+
(package (inherit %xgcc)
(name (string-append "gcc-cross-"
(if libc "" "sans-libc-")
@@ -267,9 +276,8 @@ GCC that does not target a libc; otherwise, target that libc."
(alist-delete "libc" %final-inputs))))
(if libc
`(("libc" ,libc)
- ("xlinux-headers" ;the target headers
- ,@(assoc-ref (package-propagated-inputs libc)
- "linux-headers"))
+ ("xkernel-headers" ;the target headers
+ ,@(cross-kernel-headers target libc))
,@inputs)
inputs))))
@@ -399,6 +407,19 @@ XBINUTILS and the cross tool chain."
("cross-mig" ,xmig)
,@(alist-delete "mig"(package-native-inputs hurd-minimal))))))
+ (define xkernel-headers
+ (package (inherit kernel-headers)
+ (name (string-append (package-name kernel-headers)
+ "-cross-" target))
+
+ (inputs `(("gnumach-headers" ,xgnumach-headers)
+ ("hurd-headers" ,xhurd-headers)
+ ("hurd-minimal" ,xhurd-minimal)))
+
+ (native-inputs `(("cross-gcc" ,xgcc)
+ ("cross-binutils" ,xbinutils)
+ ,@(package-native-inputs kernel-headers)))))
+
;; Choose libc based on target
(match target
("i586-pc-gnu"
@@ -410,19 +431,14 @@ XBINUTILS and the cross tool chain."
`(alist-cons-before
'pre-configure 'set-cross-hurd-headers-path
(lambda* (#:key inputs #:allow-other-keys)
- (let ((mach (assoc-ref inputs "cross-gnumach-headers"))
- (hurd (assoc-ref inputs "cross-hurd-headers"))
- (hurd-minimal (assoc-ref inputs "cross-hurd-minimal")))
+ (let ((kernel (assoc-ref inputs "kernel-headers")))
(setenv "CROSS_CPATH"
- (string-append mach "/include:"
- hurd "/include"))
+ (string-append kernel "/include"))
(setenv "CROSS_LIBRARY_PATH"
- (string-append hurd-minimal "/lib:"))))
+ (string-append kernel "/lib:"))))
,phases))))
- (propagated-inputs `(("cross-gnumach-headers" ,xgnumach-headers)
- ("cross-hurd-headers" ,xhurd-headers)
- ("cross-hurd-minimal" ,xhurd-minimal)))
+ (propagated-inputs `(("kernel-headers" ,xkernel-headers)))
(native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils)
--
2.5.0
next prev parent reply other threads:[~2015-08-01 9:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-31 18:13 [PATCH 3/3] gnu: cross-base: Use cross-kernel-headers package in cross-gcc and cross-libc Manolis Ragkousis
2015-08-01 9:35 ` Manolis Ragkousis [this message]
2015-08-09 15:10 ` Manolis Ragkousis
2015-08-10 22:10 ` Mark H Weaver
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=CAFtzXzO2JCaGBRky_nHC1caGGdNreu4i1OsjJ6yH5S8FpFZbHg@mail.gmail.com \
--to=manolis837@gmail.com \
--cc=Guix-devel@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).