virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

build: Explicitly disable external libraries when not explicitly enabled

Browse Source 
Leaving those variables in an undefined state allows them getting implicitly
enabled when they are declared as weak dependencies of other components.
In that case, the library check is not run and required linker flags are not
added, resulting in a failing build.

Fixes linking when enabling libfreetype without libfontconfig.
This commit is contained in:
Diego Biurrun
2017-02-24 14:00:24 +01:00
parent e1a6d63c7e
commit 21cca00dfe
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@@ -1296,7 +1296,6 @@ EXTERNAL_LIBRARY_LIST="
$EXTERNAL_LIBRARY_VERSION3_LIST $EXTERNAL_LIBRARY_VERSION3_LIST
avisynth avisynth
avxsynth avxsynth
bzlib
frei0r frei0r
gnutls gnutls
libbs2b libbs2b
@@ -1327,6 +1326,10 @@ EXTERNAL_LIBRARY_LIST="
libxcb libxcb
libxcb_shm libxcb_shm
libxcb_xfixes libxcb_xfixes
"
SYSTEM_LIBRARY_LIST="
bzlib
zlib zlib
" "
@@ -1388,6 +1391,7 @@ CONFIG_LIST="
$LIBRARY_LIST $LIBRARY_LIST
$PROGRAM_LIST $PROGRAM_LIST
$SUBSYSTEM_LIST $SUBSYSTEM_LIST
$SYSTEM_LIBRARY_LIST
neon_clobber_test neon_clobber_test
pic pic
pod2man pod2man
@@ -2574,6 +2578,9 @@ enable valgrind_backtrace
# By default, enable only those hwaccels that have no external dependencies. # By default, enable only those hwaccels that have no external dependencies.
enable d3d11va dxva2 vda vdpau enable d3d11va dxva2 vda vdpau
# Avoid external, non-system, libraries getting enabled by dependency resolution
disable $EXTERNAL_LIBRARY_LIST
# build settings # build settings
SHFLAGS='-shared -Wl,-soname,$$(@F)' SHFLAGS='-shared -Wl,-soname,$$(@F)'
LIBPREF="lib" LIBPREF="lib"