diff options
| author | davilla <davilla@4pi.com> | 2012-05-14 03:53:10 -0400 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2012-05-15 01:06:06 -0400 |
| commit | 2687fac6f995241e0dfb0baa4342b638b7bcae25 (patch) | |
| tree | 9b088b97b1df9278e4ae0029b2749f1d534b6b51 /lib/ffmpeg | |
| parent | 6014bd67e74d3944a970c605ac4ed6151a528e3a (diff) | |
[osx/ios] fixed ios ffmpeg configure, patch out ffmpeg configure insisting on using 'gas-preprocessor.pl ' as that fails with clang, refactor the configure of ffmpeg to allow passing -as= when expands to multiple items
Diffstat (limited to 'lib/ffmpeg')
| -rwxr-xr-x | lib/ffmpeg/configure | 2 | ||||
| -rw-r--r-- | lib/ffmpeg/patches/0029-stop-forcing-gas-preprocessor-for-darwin.patch | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/ffmpeg/configure b/lib/ffmpeg/configure index 5e11b2d229..c06005b14c 100755 --- a/lib/ffmpeg/configure +++ b/lib/ffmpeg/configure @@ -2635,7 +2635,7 @@ case $target_os in ;; darwin) enable malloc_aligned - gas="gas-preprocessor.pl $cc" + #gas="gas-preprocessor.pl $cc" enabled ppc && add_asflags -force_cpusubtype_ALL SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)' enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress diff --git a/lib/ffmpeg/patches/0029-stop-forcing-gas-preprocessor-for-darwin.patch b/lib/ffmpeg/patches/0029-stop-forcing-gas-preprocessor-for-darwin.patch new file mode 100644 index 0000000000..fb3b558fbc --- /dev/null +++ b/lib/ffmpeg/patches/0029-stop-forcing-gas-preprocessor-for-darwin.patch @@ -0,0 +1,14 @@ +diff --git a/configure b/configure +index 5e11b2d..c06005b 100755 +--- a/configure ++++ b/configure +@@ -2635,7 +2635,7 @@ case $target_os in + ;; + darwin) + enable malloc_aligned +- gas="gas-preprocessor.pl $cc" ++ #gas="gas-preprocessor.pl $cc" + enabled ppc && add_asflags -force_cpusubtype_ALL + SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)' + enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress + |