mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: cross-base: Fix some indentation problems.
* gnu/packages/cross-base.scm (cross-binutils): Fix indentation. (cross-kernel-headers): Align 'inherit' fields of nested package variables. (cross-gcc): Fix indentation.
This commit is contained in:
parent
234190df00
commit
d4c2ea9226
1 changed files with 86 additions and 76 deletions
|
@ -76,7 +76,8 @@
|
||||||
|
|
||||||
(define* (cross-binutils target #:optional (binutils binutils))
|
(define* (cross-binutils target #:optional (binutils binutils))
|
||||||
"Return a cross-Binutils for TARGET using BINUTILS."
|
"Return a cross-Binutils for TARGET using BINUTILS."
|
||||||
(let ((binutils (package (inherit binutils)
|
(let ((binutils (package
|
||||||
|
(inherit binutils)
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments
|
(substitute-keyword-arguments (package-arguments
|
||||||
binutils)
|
binutils)
|
||||||
|
@ -231,13 +232,15 @@ base compiler and using LIBC (which may be either a libc package or #f.)"
|
||||||
XGCC as the base compiler. Use XBINUTILS as the associated cross-Binutils.
|
XGCC as the base compiler. Use XBINUTILS as the associated cross-Binutils.
|
||||||
If LIBC is false, then build a GCC that does not target a libc; otherwise,
|
If LIBC is false, then build a GCC that does not target a libc; otherwise,
|
||||||
target that libc."
|
target that libc."
|
||||||
(package (inherit xgcc)
|
(package
|
||||||
|
(inherit xgcc)
|
||||||
(name (string-append "gcc-cross-"
|
(name (string-append "gcc-cross-"
|
||||||
(if libc "" "sans-libc-")
|
(if libc "" "sans-libc-")
|
||||||
target))
|
target))
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(inherit (package-source xgcc))
|
(inherit
|
||||||
|
(package-source xgcc))
|
||||||
(patches
|
(patches
|
||||||
(append
|
(append
|
||||||
(origin-patches (package-source xgcc))
|
(origin-patches (package-source xgcc))
|
||||||
|
@ -338,7 +341,8 @@ target that libc."
|
||||||
"Return headers depending on TARGET."
|
"Return headers depending on TARGET."
|
||||||
|
|
||||||
(define xlinux-headers
|
(define xlinux-headers
|
||||||
(package (inherit linux-headers)
|
(package
|
||||||
|
(inherit linux-headers)
|
||||||
(name (string-append (package-name linux-headers)
|
(name (string-append (package-name linux-headers)
|
||||||
"-cross-" target))
|
"-cross-" target))
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -364,7 +368,8 @@ target that libc."
|
||||||
,@(package-native-inputs linux-headers)))))
|
,@(package-native-inputs linux-headers)))))
|
||||||
|
|
||||||
(define xgnumach-headers
|
(define xgnumach-headers
|
||||||
(package (inherit gnumach-headers)
|
(package
|
||||||
|
(inherit gnumach-headers)
|
||||||
(name (string-append (package-name gnumach-headers)
|
(name (string-append (package-name gnumach-headers)
|
||||||
"-cross-" target))
|
"-cross-" target))
|
||||||
|
|
||||||
|
@ -373,7 +378,8 @@ target that libc."
|
||||||
,@(package-native-inputs gnumach-headers)))))
|
,@(package-native-inputs gnumach-headers)))))
|
||||||
|
|
||||||
(define xmig
|
(define xmig
|
||||||
(package (inherit mig)
|
(package
|
||||||
|
(inherit mig)
|
||||||
(name (string-append "mig-cross"))
|
(name (string-append "mig-cross"))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules ((guix build gnu-build-system)
|
`(#:modules ((guix build gnu-build-system)
|
||||||
|
@ -396,7 +402,8 @@ target that libc."
|
||||||
,@(package-native-inputs mig)))))
|
,@(package-native-inputs mig)))))
|
||||||
|
|
||||||
(define xhurd-headers
|
(define xhurd-headers
|
||||||
(package (inherit hurd-headers)
|
(package
|
||||||
|
(inherit hurd-headers)
|
||||||
(name (string-append (package-name hurd-headers)
|
(name (string-append (package-name hurd-headers)
|
||||||
"-cross-" target))
|
"-cross-" target))
|
||||||
|
|
||||||
|
@ -406,7 +413,8 @@ target that libc."
|
||||||
,@(alist-delete "mig"(package-native-inputs hurd-headers))))))
|
,@(alist-delete "mig"(package-native-inputs hurd-headers))))))
|
||||||
|
|
||||||
(define xglibc/hurd-headers
|
(define xglibc/hurd-headers
|
||||||
(package (inherit glibc/hurd-headers)
|
(package
|
||||||
|
(inherit glibc/hurd-headers)
|
||||||
(name (string-append (package-name glibc/hurd-headers)
|
(name (string-append (package-name glibc/hurd-headers)
|
||||||
"-cross-" target))
|
"-cross-" target))
|
||||||
|
|
||||||
|
@ -437,7 +445,8 @@ target that libc."
|
||||||
,@(alist-delete "mig"(package-native-inputs glibc/hurd-headers))))))
|
,@(alist-delete "mig"(package-native-inputs glibc/hurd-headers))))))
|
||||||
|
|
||||||
(define xhurd-minimal
|
(define xhurd-minimal
|
||||||
(package (inherit hurd-minimal)
|
(package
|
||||||
|
(inherit hurd-minimal)
|
||||||
(name (string-append (package-name hurd-minimal)
|
(name (string-append (package-name hurd-minimal)
|
||||||
"-cross-" target))
|
"-cross-" target))
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -464,7 +473,8 @@ target that libc."
|
||||||
,@(alist-delete "mig"(package-native-inputs hurd-minimal))))))
|
,@(alist-delete "mig"(package-native-inputs hurd-minimal))))))
|
||||||
|
|
||||||
(define xhurd-core-headers
|
(define xhurd-core-headers
|
||||||
(package (inherit hurd-core-headers)
|
(package
|
||||||
|
(inherit hurd-core-headers)
|
||||||
(name (string-append (package-name hurd-core-headers)
|
(name (string-append (package-name hurd-core-headers)
|
||||||
"-cross-" target))
|
"-cross-" target))
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue