02/05: pack: Work around ld.so bug that affects the "fakechroot" engine.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 58abd5873985e0cd9a2926867bf697c5e7bc01f9
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Oct 1 11:29:54 2020 +0200

    pack: Work around ld.so bug that affects the "fakechroot" engine.
    
    Fixes <https://bugs.gnu.org/43491>.
    
    * guix/scripts/pack.scm (wrapped-package): Use (runpath program) instead
    of (runpath #$(audit-module)).
---
 guix/scripts/pack.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 379e6a3..bab3a3e 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -817,11 +817,17 @@ last resort for relocation."
 
                             (string-append "-DLOADER_AUDIT_MODULE=\""
                                            #$(audit-module) "\"")
+
+                            ;; XXX: Normally (runpath #$(audit-module)) is
+                            ;; enough.  However, to work around
+                            ;; 
<https://sourceware.org/bugzilla/show_bug.cgi?id=26634>
+                            ;; (glibc <= 2.32), pass the whole search path of
+                            ;; PROGRAM, which presumably is a superset of that
+                            ;; of the audit module.
                             (string-append "-DLOADER_AUDIT_RUNPATH={ "
                                            (string-join
                                             (map object->string
-                                                 (runpath
-                                                  #$(audit-module)))
+                                                 (runpath program))
                                             ", " 'suffix)
                                            "NULL }")
                             (if gconv