* [PATCH] gnu: ffmpeg: Augment rpath of libraries.
@ 2015-01-16 14:26 宋文武
2015-01-16 20:36 ` Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: 宋文武 @ 2015-01-16 14:26 UTC (permalink / raw)
To: guix-devel
* gnu/packages/video.scm (ffmpeg)[arguments]<phases>[add-lib-to-run-path]:
Add $out/lib to the RUNPATH of libraries.
---
gnu/packages/video.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 2febd12..1b15577 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -184,10 +184,11 @@
(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 executables.
+ ;; Add LIB to the RUNPATH of all the executables and libraries.
(with-directory-excursion out
(for-each (cut augment-rpath <> lib)
- (find-files "bin" ".*")))))
+ (append (find-files "bin" ".*")
+ (find-files "lib" "so\\..*\\."))))))
%standard-phases))))
(home-page "http://www.ffmpeg.org/")
(synopsis "Audio and video framework")
--
2.1.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gnu: ffmpeg: Augment rpath of libraries.
2015-01-16 14:26 [PATCH] gnu: ffmpeg: Augment rpath of libraries 宋文武
@ 2015-01-16 20:36 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2015-01-16 20:36 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <iyzsong@gmail.com> skribis:
> * gnu/packages/video.scm (ffmpeg)[arguments]<phases>[add-lib-to-run-path]:
> Add $out/lib to the RUNPATH of libraries.
[...]
> - ;; Add LIB to the RUNPATH of all the executables.
> + ;; Add LIB to the RUNPATH of all the executables and libraries.
> (with-directory-excursion out
> (for-each (cut augment-rpath <> lib)
> - (find-files "bin" ".*")))))
> + (append (find-files "bin" ".*")
> + (find-files "lib" "so\\..*\\."))))))
You can even add a literal dot before “so”.
OK to push.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-16 20:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-16 14:26 [PATCH] gnu: ffmpeg: Augment rpath of libraries 宋文武
2015-01-16 20:36 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.