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: Resurrect cross-building for the Hurd.

Browse source 
* gnu/packages/base.scm (glibc)[arguments]: When building for the Hurd, in
phase "create-machine-symlink", only create symlink if it is missing.
* gnu/packages/cross-base.scm (cross-libc*)[arguments]: Likewise.

Change-Id: Ib009b7bd301b543b8629382330cca9d963b7a812
This commit is contained in:
Janneke Nieuwenhuizen 2024-11-06 12:26:47 +01:00
parent 94133452aa
commit d108a7aac2
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/base.scm
View file

@ -1088,11 +1088,12 @@ the store.")
" libmachuser.so libhurduser.so")))))) " libmachuser.so libhurduser.so"))))))
(add-after 'install 'create-machine-symlink (add-after 'install 'create-machine-symlink
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(cpu "i386")) (cpu "i386")
(symlink cpu (machine (string-append
(string-append out out "/include/mach/machine")))
"/include/mach/machine")))))) (unless (file-exists? machine)
(symlink cpu machine))))))
'())))) '()))))
(inputs `(("static-bash" ,static-bash))) (inputs `(("static-bash" ,static-bash)))

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

@ -747,11 +747,12 @@ returned."
" libmachuser.so libhurduser.so")))))) " libmachuser.so libhurduser.so"))))))
(add-after 'install 'create-machine-symlink (add-after 'install 'create-machine-symlink
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(cpu "i386")) (cpu "i386")
(symlink cpu (machine (string-append
(string-append out out "/include/mach/machine")))
"/include/mach/machine")))))) (unless (file-exists? machine)
(symlink cpu machine))))))
'()))))) '())))))
;; Shadow the native "kernel-headers" because glibc's recipe expects the ;; Shadow the native "kernel-headers" because glibc's recipe expects the