amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cross-libc: Add patch to allow 'gettyent' reading store file names.

Browse source 
* gnu/packages/patches/glibc-hurd-gettyent.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/cross-base.scm (cross-libc): Add it in 'patch-libc/hurd' phase
when 'hurd-target?' is true.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-04-05 16:45:18 +02:00 • committed by Ludovic Courtès
parent ad3bbeadb4
commit 1c4268e414
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 46 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/cross-base.scm
View file

@ -522,11 +522,15 @@ and the cross tool chain."
(string-append out "/lib/libc.so.0.3"
" libmachuser.so libhurduser.so"))))
#t))
;; TODO: move to glibc in the next rebuild cycle
(add-after 'unpack 'patch-libc/hurd
(lambda* (#:key inputs #:allow-other-keys)
(let ((patch (assoc-ref inputs
"hurd-mach-print.patch")))
(invoke "patch" "-p1" "--force" "-i" patch)))))
(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
@ -543,8 +547,11 @@ and the cross tool chain."
`(("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")))
,@(search-patches "glibc-hurd-mach-print.patch"))
("hurd-gettyent.patch"
,@(search-patches "glibc-hurd-gettyent.patch")))
'())
,@(package-inputs libc) ;FIXME: static-bash
,@(package-native-inputs libc))))))