me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
Fixes <https://bugs.gnu.org/43491>.

* guix/scripts/pack.scm (wrapped-package): Use (runpath program) instead
of (runpath #$(audit-module)).
This commit is contained in:
Ludovic Courtès 2020-10-01 11:29:54 +02:00
parent 9556ac498f
commit 58abd58739
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
guix/scripts/pack.scm
View file

@ -817,11 +817,17 @@ last resort for relocation."
(string-append "-DLOADER_AUDIT_MODULE=\"" (string-append "-DLOADER_AUDIT_MODULE=\""
#$(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-append "-DLOADER_AUDIT_RUNPATH={ "
(string-join (string-join
(map object->string (map object->string
(runpath (runpath program))
#$(audit-module)))
", " 'suffix) ", " 'suffix)
"NULL }") "NULL }")
(if gconv (if gconv