summaryrefslogtreecommitdiff
path: root/recipes/x264.recipe
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2018-03-30 14:25:03 +1100
committerMatthew Waters <matthew@centricular.com>2018-04-09 11:00:08 +1000
commit047e38e55fd1a3e1a0d791e94d2c23e3a69e5ce3 (patch)
tree8f24d8e2dcd2adafd6fc67520f5e28ce503bd3d1 /recipes/x264.recipe
parent5af0a78a708cadeb5976e6f2e8b78e62f22514a8 (diff)
recipes/x264: disable asm for android x86
It fails linking in an android application with relocation problems.
Diffstat (limited to 'recipes/x264.recipe')
-rw-r--r--recipes/x264.recipe9
1 files changed, 6 insertions, 3 deletions
diff --git a/recipes/x264.recipe b/recipes/x264.recipe
index 8bee6ae6..c6fb7ec8 100644
--- a/recipes/x264.recipe
+++ b/recipes/x264.recipe
@@ -49,13 +49,16 @@ class Recipe(recipe.Recipe):
elif self.config.target_arch == Architecture.X86:
enable_asm = False
- if enable_asm is False:
- self.configure_options += ' --disable-asm '
-
if self.config.target_platform == Platform.ANDROID:
# Don't build the cli on Android, it fails with NDK 16
self.configure_options += ' --disable-cli'
self.files_bins.remove('x264')
+ if self.config.target_arch in [Architecture.X86_64]:
+ # Fails linking into an android application
+ enable_asm = False
+
+ if enable_asm is False:
+ self.configure_options += ' --disable-asm '
def post_install(self):
libtool_la = LibtoolLibrary('x264', 148, None, None, self.config.libdir,