aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-10-13 00:34:44 +0200
committerLudovic Courtès <ludo@gnu.org>2014-10-13 00:34:44 +0200
commit7d09fb3464c90bb4a3a11e22b1460bc1c976860e (patch)
tree3ef0fd10efeca9dd77f0bd4e4f0bb3ce9b92ad44
parent817efe8bb14f298600c81713985160f76553431f (diff)
downloadgnu-guix-7d09fb3464c90bb4a3a11e22b1460bc1c976860e.tar
gnu-guix-7d09fb3464c90bb4a3a11e22b1460bc1c976860e.tar.gz
gnu: icu4c: Reinstate RUNPATH on shared libraries.
Fixes <http://bugs.gnu.org/18695>. Reported by Mark H Weaver <mhw@netris.org>. * gnu/packages/icu4c.scm (icu4c)[arguments]: In 'add-lib-to-runpath', reinstate RUNPATH on files under lib/. Fixes a regression introduced in commit 7239828.
-rw-r--r--gnu/packages/icu4c.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 7eb3874322..e7d5247d6c 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -68,12 +68,12 @@
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib")))
- ;; Add LIB to the RUNPATH of all the binaries.
+ ;; Add LIB to the RUNPATH of all the libraries and binaries.
(with-directory-excursion out
(for-each (cut augment-rpath <> lib)
- (append
- (find-files "bin" ".*")
- (find-files "sbin" ".*"))))))
+ (append (find-files "lib" ".*")
+ (find-files "bin" ".*")
+ (find-files "sbin" ".*"))))))
%standard-phases)))))
(synopsis "ICU, International Components for Unicode")
(description