mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
gnu: cross-base: Remove input labels for GNU Mach and MiG.
* gnu/packages/cross-base.scm (cross-kernel-headers*)[xgnumach-headers] [xmig]: Remove input labels; use gexps and 'modify-inputs'. [xgnumach-headers-name]: New variable.
This commit is contained in:
parent
0b4837a95b
commit
3442edac89
1 changed files with 26 additions and 25 deletions
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013-2018, 2020, 2023 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||||
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||||
|
@ -38,6 +38,7 @@ (define-module (gnu packages cross-base)
|
||||||
#:use-module (guix i18n)
|
#:use-module (guix i18n)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix gexp)
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (srfi srfi-26)
|
#:use-module (srfi srfi-26)
|
||||||
#:use-module (ice-9 match)
|
#:use-module (ice-9 match)
|
||||||
|
@ -398,39 +399,39 @@ (define xlinux-headers
|
||||||
("cross-binutils" ,xbinutils)
|
("cross-binutils" ,xbinutils)
|
||||||
,@(package-native-inputs linux-headers)))))
|
,@(package-native-inputs linux-headers)))))
|
||||||
|
|
||||||
|
(define xgnumach-headers-name
|
||||||
|
(string-append (package-name gnumach-headers) "-cross-" target))
|
||||||
|
|
||||||
(define xgnumach-headers
|
(define xgnumach-headers
|
||||||
(package
|
(package
|
||||||
(inherit gnumach-headers)
|
(inherit gnumach-headers)
|
||||||
(name (string-append (package-name gnumach-headers)
|
(name xgnumach-headers-name)
|
||||||
"-cross-" target))
|
(native-inputs
|
||||||
|
(modify-inputs (package-native-inputs gnumach-headers)
|
||||||
(native-inputs `(("cross-gcc" ,xgcc)
|
(prepend xgcc xbinutils)))))
|
||||||
("cross-binutils" ,xbinutils)
|
|
||||||
,@(package-native-inputs gnumach-headers)))))
|
|
||||||
|
|
||||||
(define xmig
|
(define xmig
|
||||||
(package
|
(package
|
||||||
(inherit mig)
|
(inherit mig)
|
||||||
(name (string-append "mig-cross"))
|
(name (string-append "mig-cross"))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules ((guix build gnu-build-system)
|
(list #:modules '((guix build gnu-build-system)
|
||||||
(guix build utils)
|
(guix build utils)
|
||||||
(srfi srfi-26))
|
(srfi srfi-26))
|
||||||
#:phases (modify-phases %standard-phases
|
#:phases
|
||||||
(add-before 'configure 'set-cross-headers-path
|
#~(modify-phases %standard-phases
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(add-before 'configure 'set-cross-headers-path
|
||||||
(let* ((mach (assoc-ref inputs "cross-gnumach-headers"))
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(cpath (string-append mach "/include")))
|
(let* ((mach #+(this-package-input xgnumach-headers-name))
|
||||||
(for-each (cut setenv <> cpath)
|
(cpath (string-append mach "/include")))
|
||||||
',%gcc-cross-include-paths)
|
(for-each (cut setenv <> cpath)
|
||||||
#t))))
|
'#$%gcc-cross-include-paths)))))
|
||||||
#:configure-flags (list ,(string-append "--target=" target))
|
#:configure-flags #~(list #$(string-append "--target=" target))
|
||||||
#:tests? #f))
|
#:tests? #f))
|
||||||
|
(propagated-inputs (list xgnumach-headers))
|
||||||
(propagated-inputs `(("cross-gnumach-headers" ,xgnumach-headers)))
|
(native-inputs
|
||||||
(native-inputs `(("cross-gcc" ,xgcc)
|
(modify-inputs (package-native-inputs mig)
|
||||||
("cross-binutils" ,xbinutils)
|
(prepend xgcc xbinutils)))))
|
||||||
,@(package-native-inputs mig)))))
|
|
||||||
|
|
||||||
(define xhurd-headers
|
(define xhurd-headers
|
||||||
(package
|
(package
|
||||||
|
|
Loading…
Reference in a new issue