diff options
| author | Unknown <jbohl@h-quer.de> | 2018-09-03 00:38:59 +0200 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-02-28 05:29:38 -0800 |
| commit | c3959c44b997e0795fa472b8fd6bef469198994b (patch) | |
| tree | 6299a3bd41505426c2c4793cca3cbd20e811a0b0 | |
| parent | 407fb7edb631c2425cf80c661987209aa1f80adc (diff) | |
| download | vcpkg-c3959c44b997e0795fa472b8fd6bef469198994b.tar.gz vcpkg-c3959c44b997e0795fa472b8fd6bef469198994b.zip | |
fix static build of ffmpeg-executables
build ffplay.exe etc. failed because we tried to link ".a"-libraries
| -rw-r--r-- | ports/ffmpeg/create-lib-libraries.patch | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ports/ffmpeg/create-lib-libraries.patch b/ports/ffmpeg/create-lib-libraries.patch index dcc767cd2..ccad5ff8c 100644 --- a/ports/ffmpeg/create-lib-libraries.patch +++ b/ports/ffmpeg/create-lib-libraries.patch @@ -12,8 +12,20 @@ diff --git a/configure b/configure index ba38a73906..0a3f308323 100755 --- a/configure +++ b/configure -@@ -5031,6 +5031,8 @@ case $target_os in - fi +@@ -4890,15 +4890,17 @@ + ;; + win32|win64) + disable symver +- if enabled shared; then ++# if enabled shared; then + # Link to the import library instead of the normal static library + # for shared libs. + LD_LIB='%.lib' + # Cannot build both shared and static libs with MSVC or icl. +- disable static +- fi ++# disable static ++# fi enabled x86_32 && check_ldflags -LARGEADDRESSAWARE shlibdir_default="$bindir_default" + LIBPREF="" |