[PATCH] gnu: ffmpeg: Augment rpath of libraries.

[PATCH] gnu: ffmpeg: Augment rpath of libraries.

[宋文武]

* 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

Re: [PATCH] gnu: ffmpeg: Augment rpath of libraries.

[Ludovic Courtès]

宋文武 <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’.