diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:21:47 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:49:06 +0100 |
| commit | ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe (patch) | |
| tree | 4ab573cee33f277828ad553a22579175b1dda22d /guix/scripts/pack.scm | |
| parent | 098bd280f82350073e8280e37d56a14162eed09c (diff) | |
| parent | f80215c7c4ae5ea0c316f4766e6c05ae4218ede3 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'guix/scripts/pack.scm')
| -rw-r--r-- | guix/scripts/pack.scm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index eb41eb5563..0dc9979194 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -28,7 +28,6 @@ #:use-module (guix scripts) #:use-module (guix ui) #:use-module (guix gexp) - #:use-module ((guix build utils) #:select (%xz-parallel-args)) #:use-module (guix utils) #:use-module (guix store) #:use-module ((guix status) #:select (with-status-verbosity)) @@ -54,7 +53,6 @@ #:use-module ((gnu packages compression) #:hide (zip)) #:use-module (gnu packages guile) #:use-module (gnu packages base) - #:autoload (gnu packages package-management) (guix) #:autoload (gnu packages gnupg) (guile-gcrypt) #:autoload (gnu packages guile) (guile2.0-json guile-json) #:use-module (srfi srfi-1) @@ -1203,12 +1201,10 @@ last resort for relocation." (utf8->string bv))))) (define (runpath file) - ;; Return the RUNPATH of FILE as a list of directories. - (let* ((bv (call-with-input-file file get-bytevector-all)) - (elf (parse-elf bv)) - (dyninfo (elf-dynamic-info elf))) - (or (and=> dyninfo elf-dynamic-info-runpath) - '()))) + ;; Return the "recursive" RUNPATH of FILE as a list of + ;; directories. + (delete-duplicates + (map dirname (file-needed/recursive file)))) (define (elf-loader-compile-flags program) ;; Return the cpp flags defining macros for the ld.so/fakechroot |