mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
gnu: glibc: Move patches for the Hurd from cross-libc.
* gnu/packages/cross-base.scm (cross-libc)[arguments]: Remove "patch-libc/hurd" stage. [native-inputs]: Move hurd patches to... * gnu/packages/base.scm (glibc)[source]: ...here.
This commit is contained in:
parent
6f95911ad1
commit
6690b6d1e7
2 changed files with 4 additions and 21 deletions
|
@ -702,7 +702,9 @@ (define-public glibc
|
||||||
"glibc-supported-locales.patch"
|
"glibc-supported-locales.patch"
|
||||||
"glibc-hurd-clock_t_centiseconds.patch"
|
"glibc-hurd-clock_t_centiseconds.patch"
|
||||||
"glibc-hurd-clock_gettime_monotonic.patch"
|
"glibc-hurd-clock_gettime_monotonic.patch"
|
||||||
"glibc-hurd-signal-sa-siginfo.patch"))))
|
"glibc-hurd-signal-sa-siginfo.patch"
|
||||||
|
"glibc-hurd-mach-print.patch"
|
||||||
|
"glibc-hurd-gettyent.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
|
||||||
;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
|
;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
|
||||||
|
|
|
@ -521,16 +521,7 @@ (define* (cross-libc target
|
||||||
(("/[^ ]+/lib/libc.so.0.3")
|
(("/[^ ]+/lib/libc.so.0.3")
|
||||||
(string-append out "/lib/libc.so.0.3"
|
(string-append out "/lib/libc.so.0.3"
|
||||||
" libmachuser.so libhurduser.so"))))
|
" libmachuser.so libhurduser.so"))))
|
||||||
#t))
|
#t)))
|
||||||
;; TODO: move to glibc in the next rebuild cycle
|
|
||||||
(add-after 'unpack 'patch-libc/hurd
|
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
|
||||||
(for-each
|
|
||||||
(lambda (name)
|
|
||||||
(let ((patch (assoc-ref inputs name)))
|
|
||||||
(invoke "patch" "-p1" "--force" "-i" patch)))
|
|
||||||
'("hurd-mach-print.patch"
|
|
||||||
"hurd-gettyent.patch")))))
|
|
||||||
'())))))
|
'())))))
|
||||||
|
|
||||||
;; Shadow the native "kernel-headers" because glibc's recipe expects the
|
;; Shadow the native "kernel-headers" because glibc's recipe expects the
|
||||||
|
@ -543,16 +534,6 @@ (define* (cross-libc target
|
||||||
|
|
||||||
(native-inputs `(("cross-gcc" ,xgcc)
|
(native-inputs `(("cross-gcc" ,xgcc)
|
||||||
("cross-binutils" ,xbinutils)
|
("cross-binutils" ,xbinutils)
|
||||||
,@(if (hurd-triplet? target)
|
|
||||||
`(("cross-mig"
|
|
||||||
,@(assoc-ref (package-native-inputs xheaders)
|
|
||||||
"cross-mig"))
|
|
||||||
;; TODO: move to glibc in the next rebuild cycle
|
|
||||||
("hurd-mach-print.patch"
|
|
||||||
,@(search-patches "glibc-hurd-mach-print.patch"))
|
|
||||||
("hurd-gettyent.patch"
|
|
||||||
,@(search-patches "glibc-hurd-gettyent.patch")))
|
|
||||||
'())
|
|
||||||
,@(package-inputs libc) ;FIXME: static-bash
|
,@(package-inputs libc) ;FIXME: static-bash
|
||||||
,@(package-native-inputs libc))))))
|
,@(package-native-inputs libc))))))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue