diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-01-19 13:22:02 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:28 +0200 |
| commit | 0ff267cdf23a4121c6f7465ec90d6c6844933270 (patch) | |
| tree | b07020bf1bf0eadc7e56fa5bd7432d580f9a1bc0 | |
| parent | feae33359f578cb4ae4039878b77133a9e352730 (diff) | |
| download | guix-0ff267cdf23a4121c6f7465ec90d6c6844933270.tar.gz guix-0ff267cdf23a4121c6f7465ec90d6c6844933270.zip | |
gnu: glibc/hurd: Install include/mach/machine symlink.
* gnu/packages/base.scm (glibc): When building for the Hurd, add phase
`create-machine-symlink'.
* gnu/packages/cross-base.scm (cross-libc*): Likewise.
Change-Id: I61fa081ce081f05bed918a438fd9d4eec94ef4bf
| -rw-r--r-- | gnu/packages/base.scm | 11 | ||||
| -rw-r--r-- | gnu/packages/cross-base.scm | 12 |
2 files changed, 18 insertions, 5 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 849ec13fde..521cb68876 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1075,11 +1075,18 @@ the store.") ,@(if (target-hurd?) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) + (let ((out (assoc-ref outputs "out"))) (substitute* (string-append out "/lib/libc.so") (("/[^ ]+/lib/libc.so.0.3") (string-append out "/lib/libc.so.0.3" - " libmachuser.so libhurduser.so"))))))) + " libmachuser.so libhurduser.so")))))) + (add-after 'install 'create-machine-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (cpu "i386")) + (symlink cpu + (string-append out + "/include/mach/machine")))))) '())))) (inputs `(("static-bash" ,static-bash))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index af5fe739a1..6c524f3a53 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -742,12 +742,18 @@ returned." ,@(if (target-hurd? target) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) + (let ((out (assoc-ref outputs "out"))) (substitute* (string-append out "/lib/libc.so") (("/[^ ]+/lib/libc.so.0.3") (string-append out "/lib/libc.so.0.3" - " libmachuser.so libhurduser.so")))) - #t))) + " libmachuser.so libhurduser.so")))))) + (add-after 'install 'create-machine-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (cpu "i386")) + (symlink cpu + (string-append out + "/include/mach/machine")))))) '()))))) ;; Shadow the native "kernel-headers" because glibc's recipe expects the |