diff options
Diffstat (limited to 'recipes/libvpx/0002-build-make-configure.sh-Fix-armv7-builds-in-Xcode7.patch')
| -rw-r--r-- | recipes/libvpx/0002-build-make-configure.sh-Fix-armv7-builds-in-Xcode7.patch | 92 |
1 files changed, 92 insertions, 0 deletions
diff --git a/recipes/libvpx/0002-build-make-configure.sh-Fix-armv7-builds-in-Xcode7.patch b/recipes/libvpx/0002-build-make-configure.sh-Fix-armv7-builds-in-Xcode7.patch new file mode 100644 index 00000000..d74bc386 --- /dev/null +++ b/recipes/libvpx/0002-build-make-configure.sh-Fix-armv7-builds-in-Xcode7.patch @@ -0,0 +1,92 @@ +From 1f73ac4c5cef57fd10144e7ecfa299d5680d4ba3 Mon Sep 17 00:00:00 2001 +From: Tom Finegan <tomfinegan@google.com> +Date: Fri, 18 Sep 2015 15:58:41 -0700 +Subject: [PATCH 2/3] build/make/configure.sh: Fix armv7 builds in Xcode7. + +- Use the iphoneos SDK path (instead of macosx). +- Detect iOS SDK major version and disable media (armv6) when using + iOS SDK version 9 or higher. + +BUG=https://code.google.com/p/webm/issues/detail?id=1075 + +Change-Id: I12f77dbeee4c0084e8322f6841813da8b5e91c16 +--- + build/make/configure.sh | 44 +++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 41 insertions(+), 3 deletions(-) + +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 46fde74..28c8eee 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -625,6 +625,11 @@ show_darwin_sdk_path() { + xcodebuild -sdk $1 -version Path 2>/dev/null + } + ++# Print the major version number of the Darwin SDK specified by $1. ++show_darwin_sdk_major_version() { ++ xcrun --sdk $1 --show-sdk-version 2>/dev/null | cut -d. -f1 ++} ++ + process_common_toolchain() { + if [ -z "$toolchain" ]; then + gcctarget="${CHOST:-$(gcc -dumpmachine 2> /dev/null)}" +@@ -750,7 +755,14 @@ process_common_toolchain() { + # Handle darwin variants. Newer SDKs allow targeting older + # platforms, so use the newest one available. + case ${toolchain} in +- *-darwin*) ++ arm*-darwin*) ++ iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)" ++ if [ -d "${iphoneos_sdk_dir}" ]; then ++ add_cflags "-isysroot ${iphoneos_sdk_dir}" ++ add_ldflags "-isysroot ${iphoneos_sdk_dir}" ++ fi ++ ;; ++ x86*-darwin*) + osx_sdk_dir="$(show_darwin_sdk_path macosx)" + if [ -d "${osx_sdk_dir}" ]; then + add_cflags "-isysroot ${osx_sdk_dir}" +@@ -826,12 +838,38 @@ process_common_toolchain() { + if disabled neon && enabled neon_asm; then + die "Disabling neon while keeping neon-asm is not supported" + fi +- soft_enable media + soft_enable fast_unaligned ++ case ${toolchain} in ++ # Apple iOS SDKs no longer support armv6 as of the version 9 ++ # release (coincides with release of Xcode 7). Only enable media ++ # when using earlier SDK releases. ++ *-darwin*) ++ if [ "$(show_darwin_sdk_major_version iphoneos)" -lt 9 ]; then ++ soft_enable media ++ else ++ soft_disable media ++ RTCD_OPTIONS="${RTCD_OPTIONS}--disable-media " ++ fi ++ ;; ++ *) ++ soft_enable media ++ ;; ++ esac + ;; + armv6) +- soft_enable media + soft_enable fast_unaligned ++ case ${toolchain} in ++ *-darwin*) ++ if [ "$(show_darwin_sdk_major_version iphoneos)" -lt 9 ]; then ++ soft_enable media ++ else ++ die "Your iOS SDK does not support armv6." ++ fi ++ ;; ++ *) ++ soft_enable media ++ ;; ++ esac + ;; + esac + +-- +2.6.1 + |