[PATCH] gnu: base: Add libmachuser.so and libhurduser.so to libc.so's search path.

[PATCH] gnu: base: Add libmachuser.so and libhurduser.so to libc.so's search path.

[Manolis Ragkousis]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0001-gnu-base-Add-libmachuser.so-and-libhurduser.so-to-li.patch --]
[-- Type: text/x-patch, Size: 1553 bytes --]

From aaad86209c236ea13bcc088fc470bce3f775fee3 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Fri, 24 Jul 2015 22:29:28 +0300
Subject: [PATCH] gnu: base: Add libmachuser.so and libhurduser.so to libc.so's
 search path.

* gnu/packages/base.scm (glibc/hurd): Add augment-libc.so phase.
---
 gnu/packages/base.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 8c03dd8..07a06c9 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -635,7 +635,19 @@ with the Linux kernel.")
 
     (arguments
      (substitute-keyword-arguments (package-arguments glibc/linux)
-       ((#:configure-flags original-configure-flags)
+       ((#:phases original-phases)
+        ;; Add libmachuser.so and libhurduser.so to libc.so's search path.
+        ;; See <http://lists.gnu.org/archive/html/bug-hurd/2015-07/msg00051.html>.
+        `(alist-cons-after
+          'install 'augment-libc.so
+          (lambda* (#:key outputs #:allow-other-keys)
+            (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)
+          ,original-phases))
+        ((#:configure-flags original-configure-flags)
         `(append (list "--host=i586-pc-gnu"
 
                        ;; We need this to get a working openpty() function.
-- 
2.4.6

Re: [PATCH] gnu: base: Add libmachuser.so and libhurduser.so to libc.so's search path.

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> From aaad86209c236ea13bcc088fc470bce3f775fee3 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Fri, 24 Jul 2015 22:29:28 +0300
> Subject: [PATCH] gnu: base: Add libmachuser.so and libhurduser.so to libc.so's
>  search path.
>
> * gnu/packages/base.scm (glibc/hurd): Add augment-libc.so phase.

OK!  For wip-hurd, I guess?

Ludo’.