diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-09 14:17:46 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-09 14:27:45 +0200 |
| commit | 8a279d310db38af1cedd7b3e4c228ac3298df5e9 (patch) | |
| tree | 011a420ffca9a8de93f1f328e93ec88274dc4a4f | |
| parent | dc0bf05f28e22501d6f1ca9fd449d0be37b2cbf6 (diff) | |
Fix build with ARMv5 again
| -rw-r--r-- | recipes/libvpx.recipe | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/recipes/libvpx.recipe b/recipes/libvpx.recipe index 8ae7db8..958df47 100644 --- a/recipes/libvpx.recipe +++ b/recipes/libvpx.recipe @@ -52,6 +52,9 @@ class Recipe(recipe.Recipe): elif self.config.target_platform == Platform.ANDROID: if self.config.target_arch == Architecture.ARM: arch = 'armv5te' + # Fix compiler error with -mthumb + self.new_env['CFLAGS'] = os.environ['CFLAGS'].replace('-mthumb', '') + self.new_env['CFLAGS'] = self.new_env['CFLAGS'] + " -Dandroid_getCpuFamily=vpx_android_getCpuFamily -Dandroid_getCpuFeatures=vpx_android_getCpuFeatures -Dandroid_getCpuCount=vpx_android_getCpuCount " elif self.config.target_arch == Architecture.ARMv7: arch = 'armv7' self.new_env['CFLAGS'] = os.environ['CFLAGS'] + " -Dandroid_getCpuFamily=vpx_android_getCpuFamily -Dandroid_getCpuFeatures=vpx_android_getCpuFeatures -Dandroid_getCpuCount=vpx_android_getCpuCount " @@ -60,7 +63,7 @@ class Recipe(recipe.Recipe): platform = 'android' self.config_sh = 'LD=$CC ./configure' self.configure_options.replace('--as=yasm', '') - self.configure_options += ' --disable-runtime-cpu-detect --sdk-path=%s ' % self.config.toolchain_prefix + self.configure_options += ' --sdk-path=%s ' % self.config.toolchain_prefix else: self.configure_options += '--enable-shared ' platform = 'linux' |