diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-09-22 17:03:13 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-11-08 00:54:04 +0100 |
| commit | 293258762ff2fb3182ffa55799fe6fe987dc19ce (patch) | |
| tree | 2a5ca3450c3b939214f3f823e117ee8949367eef | |
| parent | 12f336518e66e1cfb6edb6ce122d0fe2e38dddbb (diff) | |
libvpx: Add support for iOS on x86-641.4.4
Also fix a problem with the simulator on x86
| -rw-r--r-- | recipes/libvpx.recipe | 1 | ||||
| -rw-r--r-- | recipes/libvpx/0008-Add-support-for-iOS-simulator-on-x86-64.patch | 48 |
2 files changed, 49 insertions, 0 deletions
diff --git a/recipes/libvpx.recipe b/recipes/libvpx.recipe index 0575354e..ba0e86f7 100644 --- a/recipes/libvpx.recipe +++ b/recipes/libvpx.recipe @@ -25,6 +25,7 @@ class Recipe(recipe.Recipe): 'libvpx/0005-Add-support-for-iOS-7.0-toolchain.patch', 'libvpx/0006-Add-armv7s-ios-support.patch', 'libvpx/0007-configure-quote-local-variables-correctly.patch', + 'libvpx/0008-Add-support-for-iOS-simulator-on-x86-64.patch', ] files_libs = ['libvpx'] diff --git a/recipes/libvpx/0008-Add-support-for-iOS-simulator-on-x86-64.patch b/recipes/libvpx/0008-Add-support-for-iOS-simulator-on-x86-64.patch new file mode 100644 index 00000000..346d486f --- /dev/null +++ b/recipes/libvpx/0008-Add-support-for-iOS-simulator-on-x86-64.patch @@ -0,0 +1,48 @@ +From 98ae18374a0b54c69b6fdc9b55fb76cc3236691d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Mon, 22 Sep 2014 16:01:57 +0200 +Subject: [PATCH] Add support for iOS simulator on x86-64 + +--- + build/make/configure.sh | 12 ++++++++++-- + configure | 1 + + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 44b443a..9076104 100755 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -797,8 +797,16 @@ process_common_toolchain() { + add_ldflags "-mmacosx-version-min=10.9" + ;; + *-ios*) +- add_cflags "-miphoneos-version-min=5.1" +- add_ldflags "-miphoneos-version-min=5.1" ++ case "$tgt_isa" in ++ arm*) ++ add_cflags "-miphoneos-version-min=5.1" ++ add_ldflags "-miphoneos-version-min=5.1" ++ ;; ++ x86*) ++ add_cflags "-mios-simulator-version-min=5.1" ++ add_ldflags "-mios-simulator-version-min=5.1" ++ ;; ++ esac + ;; + esac + +diff --git a/configure b/configure +index f2423a2..833abb4 100755 +--- a/configure ++++ b/configure +@@ -141,6 +141,7 @@ all_platforms="${all_platforms} x86_64-darwin10-gcc" + all_platforms="${all_platforms} x86_64-darwin11-gcc" + all_platforms="${all_platforms} x86_64-darwin12-gcc" + all_platforms="${all_platforms} x86_64-darwin13-gcc" ++all_platforms="${all_platforms} x86_64-ios7-gcc" + all_platforms="${all_platforms} x86_64-linux-gcc" + all_platforms="${all_platforms} x86_64-linux-icc" + all_platforms="${all_platforms} x86_64-solaris-gcc" +-- +1.9.3 (Apple Git-50) + |