diff mbox

[FFmpeg-devel] configure: Make sure libpostproc can be found if -rpath-link doesn't work

Message ID CAB0OVGobbANFyTN+-vvaPC-azyGEmCDMEPJMgtUYHG3zC6+ydQ@mail.gmail.com
State Superseded
Headers show

Commit Message

Carl Eugen Hoyos Dec. 21, 2018, 11:08 p.m. UTC
Hi!

Attached patch fixes running fate with "--enable-shared --enable-gpl" on
Solaris, the linker searches "libpostproc" in a directory"-link=libpostproc".
Only tested on Solaris.

Please comment, Carl Eugen

Comments

Michael Niedermayer Dec. 22, 2018, 8:35 a.m. UTC | #1
On Sat, Dec 22, 2018 at 12:08:19AM +0100, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch fixes running fate with "--enable-shared --enable-gpl" on
> Solaris, the linker searches "libpostproc" in a directory"-link=libpostproc".
> Only tested on Solaris.
> 
> Please comment, Carl Eugen

>  configure |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> cb5e59b98712ca53aba4561f4d7fe365b3b1e2ff  0001-configure-Make-sure-libpostproc-can-be-found-if-rpat.patch
> From d69f1fcee41e803e5208bbfabdeb37a19e73814b Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Date: Sat, 22 Dec 2018 00:04:43 +0100
> Subject: [PATCH] configure: Make sure libpostproc can be found if -rpath-link
>  doesn't work.
> 
> Solaris ld takes "-rpath-link=libpostproc" as indication to search in "-link=libpostproc".
> ---
>  configure |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 2205751..04d3417 100755
> --- a/configure
> +++ b/configure
> @@ -6535,7 +6535,7 @@ EOF
>  
>  # add some linker flags
>  check_ldflags -Wl,--warn-common
> -check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
> +check_ldflags -Wl,-rpath-link=:libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
>  enabled rpath && add_ldexeflags -Wl,-rpath,$libdir && add_ldsoflags -Wl,-rpath,$libdir
>  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic

theres a second similar use of rpath in git (in tools/target_dec_fuzzer.c)

[...]
diff mbox

Patch

From d69f1fcee41e803e5208bbfabdeb37a19e73814b Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Sat, 22 Dec 2018 00:04:43 +0100
Subject: [PATCH] configure: Make sure libpostproc can be found if -rpath-link
 doesn't work.

Solaris ld takes "-rpath-link=libpostproc" as indication to search in "-link=libpostproc".
---
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 2205751..04d3417 100755
--- a/configure
+++ b/configure
@@ -6535,7 +6535,7 @@  EOF
 
 # add some linker flags
 check_ldflags -Wl,--warn-common
-check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
+check_ldflags -Wl,-rpath-link=:libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
 enabled rpath && add_ldexeflags -Wl,-rpath,$libdir && add_ldsoflags -Wl,-rpath,$libdir
 test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
 
-- 
1.7.10.4