Commit 97a0bad8 authored by Reimar Döffinger's avatar Reimar Döffinger

Add --enable-rpath option to add -Wl,-rpath to pkg-config files.

This allows installing into e.g. /usr/lib/ffmpeg and binaries linked
against ffmpeg will pick these .so file while binaries linked against
some fork or different version will pick the libraries in /usr/lib.
There will be still some issues for binaries that (indirectly) end up
depending on multiple variants, but for the simpler cases it should allow
different applications to use different (compatible) variants that
are installed at the same time.
Signed-off-by: 's avatarReimar Döffinger <Reimar.Doeffinger@gmx.de>
parent ffe31c65
...@@ -87,6 +87,8 @@ Standard options: ...@@ -87,6 +87,8 @@ Standard options:
--shlibdir=DIR install shared libs in DIR [PREFIX/lib] --shlibdir=DIR install shared libs in DIR [PREFIX/lib]
--incdir=DIR install includes in DIR [PREFIX/include] --incdir=DIR install includes in DIR [PREFIX/include]
--mandir=DIR install man page in DIR [PREFIX/share/man] --mandir=DIR install man page in DIR [PREFIX/share/man]
--enable-rpath use rpath to allow installing libraries in paths
not part of the dynamic linker search path
Licensing options: Licensing options:
--enable-gpl allow use of GPL code, the resulting libs --enable-gpl allow use of GPL code, the resulting libs
...@@ -1612,6 +1614,7 @@ CMDLINE_SELECT=" ...@@ -1612,6 +1614,7 @@ CMDLINE_SELECT="
logging logging
lto lto
optimizations optimizations
rpath
stripping stripping
" "
...@@ -4468,6 +4471,7 @@ check_disable_warning -Wno-pointer-sign ...@@ -4468,6 +4471,7 @@ check_disable_warning -Wno-pointer-sign
# add some linker flags # add some linker flags
check_ldflags -Wl,--warn-common 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_ldflags -Wl,-rpath=$libdir
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
enabled xmm_clobber_test && enabled xmm_clobber_test &&
...@@ -4980,7 +4984,7 @@ Version: $version ...@@ -4980,7 +4984,7 @@ Version: $version
Requires: $(enabled shared || echo $requires) Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires) Requires.private: $(enabled shared && echo $requires)
Conflicts: Conflicts:
Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs) Libs: -L\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs)
Libs.private: $(enabled shared && echo $libs) Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir} Cflags: -I\${includedir}
EOF EOF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment