01/03: gnu: glibc/hurd: Install include/mach/machine symlink.

[guix-commits]

janneke pushed a commit to branch core-updates
in repository guix.

commit 6994f4c89d983f4b1d1188bd1570c6cc56c38a92
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Fri Jan 19 13:22:02 2024 +0100

    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
---
 gnu/packages/base.scm       | 11 +++++++++--
 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 4fe6651a73..1270184f12 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1025,11 +1025,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 7fa9772cb9..b1c34db7d2 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -725,12 +725,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