diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-05-31 16:25:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-31 16:25:56 -0700 |
| commit | 9356be6b5ade7056858c92012e58443aec6269d1 (patch) | |
| tree | 879686f26d4e1367eccae96edd3e8ec25ca9d16e /ports/ffmpeg/fixed-debug-bzip2-link.patch | |
| parent | f2e1c52db8fe100ef91313760d6a59a13ac6e05e (diff) | |
| download | vcpkg-9356be6b5ade7056858c92012e58443aec6269d1.tar.gz vcpkg-9356be6b5ade7056858c92012e58443aec6269d1.zip | |
[ffmpeg] Correctly set environment variables for gcc/clang/icc (#6694)
* Correctly set environment variables for gcc/clang/icc
* refactor out some if statements
Diffstat (limited to 'ports/ffmpeg/fixed-debug-bzip2-link.patch')
| -rw-r--r-- | ports/ffmpeg/fixed-debug-bzip2-link.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/ports/ffmpeg/fixed-debug-bzip2-link.patch b/ports/ffmpeg/fixed-debug-bzip2-link.patch deleted file mode 100644 index 29e2913fa..000000000 --- a/ports/ffmpeg/fixed-debug-bzip2-link.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN a/configure b/configure ---- a/configure 2018-09-08 20:53:33.556275600 +0800 -+++ b/configure 2018-09-08 20:55:46.238584400 +0800 -@@ -4753,6 +4753,8 @@ - enable $subarch - enabled spic && enable_weak pic - -+bzlib_name=bz2 -+ - # OS specific - case $target_os in - aix) -@@ -4914,6 +4916,11 @@ - objformat="win32" - ranlib=: - enable dos_paths -+ if [ -z "${extra_cflags##*-MDd*}" ] || [ -z "${extra_cflags##*-MTd*}" ]; then -+ bzlib_name=bz2d -+ else -+ bzlib_name=bz2 -+ fi - ;; - cygwin*) - target_os=cygwin -@@ -5734,7 +5741,7 @@ - check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)" - - disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib --disabled bzlib || check_lib bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib -+disabled bzlib || check_lib bzlib.h BZ2_bzlibVersion -l$bzlib_name || disable bzlib - disabled lzma || check_lib lzma.h lzma_version_number -llzma || disable lzma - - check_lib math.h sin -lm && LIBM="-lm" |