[Buildroot] [git commit] x264: use assembly files on ARMv7

Peter Korsgaard peter at korsgaard.com
Sat Oct 11 11:22:52 UTC 2014


commit: http://git.buildroot.net/buildroot/commit/?id=ae2c1f889883081e687e1b2cd59c08417232c0a8
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

[Peter: use positive logic for ifeq, move ARM handling inside ifeq]
Signed-off-by: David du Colombier <0intro at gmail.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/x264/x264.mk |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/package/x264/x264.mk b/package/x264/x264.mk
index 35d9fef..ac8fe94 100644
--- a/package/x264/x264.mk
+++ b/package/x264/x264.mk
@@ -14,6 +14,10 @@ X264_INSTALL_STAGING = YES
 
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
 X264_DEPENDENCIES += host-yasm
+else ifeq ($(BR2_cortex_a5)$(BR2_cortex_a7)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a12)$(BR2_cortex_a15),y)
+# We need to pass gcc as AS, because the ARM assembly files have to be
+# preprocessed
+X264_CONF_ENV += AS="$(TARGET_CC)"
 else
 X264_CONF_OPTS += --disable-asm
 endif
@@ -32,7 +36,7 @@ endif
 
 # the configure script is not generated by autoconf
 define X264_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure \
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(X264_CONF_ENV) ./configure \
 		--prefix=/usr \
 		--host="$(GNU_TARGET_NAME)" \
 		--cross-prefix="$(TARGET_CROSS)" \


More information about the buildroot mailing list