diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2016-07-13 21:47:39 -0400 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2016-07-13 21:47:39 -0400 |
| commit | 049170eb2843e5f39fe3f09f0c409e711325d8cb (patch) | |
| tree | 0a662aebb3d2fcf9f57275ebd7ed9e8b8076252a /recipes | |
| parent | ea7707d60299d10fe874bab4d8d36c4066454bb8 (diff) | |
openh264: Re-add armv7s for iOS
I miss-read the makefile, while armv7s means nothing on most OS
supported, on iOS it's being passed to the compiler which does some
magic. The dylib generator complain otherwise, since it gets twice armv7
to package.
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/openh264.recipe | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes/openh264.recipe b/recipes/openh264.recipe index 00c53385..ff59f9db 100644 --- a/recipes/openh264.recipe +++ b/recipes/openh264.recipe @@ -27,8 +27,10 @@ class Recipe(recipe.Recipe): make += ' ARCH=i386' elif self.config.target_arch == Architecture.X86_64: make += ' ARCH=x86_64' - elif self.config.target_arch in [Architecture.ARMv7, Architecture.ARMv7S]: + elif self.config.target_arch == Architecture.ARMv7: make += ' ARCH=armv7' + elif self.config.target_arch == Architecture.ARMv7S: + make += ' ARCH=armv7s' elif self.config.target_arch == Architecture.ARM: make += ' ARCH=arm APP_ABI=armeabi' elif self.config.target_arch == Architecture.ARM64: |