diff options
| author | Jan Schmidt <jan@centricular.com> | 2016-09-03 03:45:21 +1000 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2016-09-05 17:05:41 +1000 |
| commit | d197b6c313a3051e87f611df9a9057baa6bf662a (patch) | |
| tree | 4d34d6e45b786830311062c53212c009bd199807 | |
| parent | fc92aaa496aefa4326a15c7a88dba45baf0de78d (diff) | |
openh264: Remove -fembed-bitcode for iOS build.1.9.2
We don't build bitcode for anything else, so it
will be dropped anyway, and breaks support for Xcode 6
unnecessarily
| -rw-r--r-- | recipes/openh264.recipe | 1 | ||||
| -rw-r--r-- | recipes/openh264/0002-Remove-fembed-bitcode-for-iOS-build.patch | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/recipes/openh264.recipe b/recipes/openh264.recipe index 1785744c..7f9b5894 100644 --- a/recipes/openh264.recipe +++ b/recipes/openh264.recipe @@ -16,6 +16,7 @@ class Recipe(recipe.Recipe): # we'll need to carry forward that bit for ourselves. # 0002: Fixed upstream, remove patch on next update patches = [name + '/0001-Add-version-suffix.patch'] + patches += [name + '/0002-Remove-fembed-bitcode-for-iOS-build.patch'] files_libs = ['libopenh264'] files_devel = ['include/wels', 'lib/pkgconfig/openh264.pc'] diff --git a/recipes/openh264/0002-Remove-fembed-bitcode-for-iOS-build.patch b/recipes/openh264/0002-Remove-fembed-bitcode-for-iOS-build.patch new file mode 100644 index 00000000..f34f6b1e --- /dev/null +++ b/recipes/openh264/0002-Remove-fembed-bitcode-for-iOS-build.patch @@ -0,0 +1,25 @@ +From 273749d669fc1e73298ca2fb265b32a512f512ce Mon Sep 17 00:00:00 2001 +From: Jan Schmidt <jan@centricular.com> +Date: Sat, 3 Sep 2016 03:26:14 +1000 +Subject: [PATCH] Remove -fembed-bitcode for iOS build. + +To keep support for XCode 6 +--- + build/platform-ios.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/platform-ios.mk b/build/platform-ios.mk +index 4ec8919..5bcb28e 100644 +--- a/build/platform-ios.mk ++++ b/build/platform-ios.mk +@@ -12,6 +12,6 @@ SDK_MIN = 5.1 + + XCODE=$(shell xcode-select -p) + SDKROOT = $(XCODE)/Platforms/$(SDKTYPE).platform/Developer/SDKs/$(SDKTYPE)$(SDK).sdk +-CFLAGS += -arch $(ARCH) -isysroot $(SDKROOT) -miphoneos-version-min=$(SDK_MIN) -DAPPLE_IOS -fembed-bitcode ++CFLAGS += -arch $(ARCH) -isysroot $(SDKROOT) -miphoneos-version-min=$(SDK_MIN) -DAPPLE_IOS + LDFLAGS += -arch $(ARCH) -isysroot $(SDKROOT) -miphoneos-version-min=$(SDK_MIN) + +-- +2.3.2 (Apple Git-55) + |