diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-09 12:08:05 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-09 12:08:05 +0200 |
| commit | 4d592bd6c046d619a61891017fc6ec5c112e6e3a (patch) | |
| tree | 4f8687aaf6422864656ae4c55e83ba1c458cb229 | |
| parent | 3b71f219d011dd39f389e0e90aaaec0441d6aab6 (diff) | |
Fix some checks
| -rw-r--r-- | recipes/libmad.recipe | 2 | ||||
| -rw-r--r-- | recipes/libvpx.recipe | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/recipes/libmad.recipe b/recipes/libmad.recipe index abe7fd7b..5ab4d823 100644 --- a/recipes/libmad.recipe +++ b/recipes/libmad.recipe @@ -9,7 +9,7 @@ class Recipe(recipe.Recipe): files_devel = ['include/mad.h'] def prepare(self): - if self.config.target_platform == Platform.ANDROID: + if self.config.target_arch == Architecture.ARM or self.config.target_arch == Architecture.ARMv7: self.autoreconf = True # Disable thumb mode to get the optimizations compiled properly self.new_env['CFLAGS'] = os.environ['CFLAGS'].replace('-mthumb', '') diff --git a/recipes/libvpx.recipe b/recipes/libvpx.recipe index 426e8ef3..9836f1e4 100644 --- a/recipes/libvpx.recipe +++ b/recipes/libvpx.recipe @@ -49,13 +49,16 @@ class Recipe(recipe.Recipe): platform = 'win32' # FIXME: elif self.config.target_platform == Platform.ANDROID: - arch = 'armv5te' + if self.config.target_arch == Architecture.ARM or self.config.target_arch == Architecture.ARMv7: + arch = 'armv5te' + # Fix compiler error with -mthumb + self.new_env['CFLAGS'] = os.environ['CFLAGS'].replace('-mthumb', '') + else: + raise FatalError("Unsupported Android architecture %s" % self.config.target_arch) 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 - # Fix compiler error with -mthumb - self.new_env['CFLAGS'] = os.environ['CFLAGS'].replace('-mthumb', '') else: self.configure_options += '--enable-shared ' platform = 'linux' |