x264: use assembly files on ARMv7

[Peter: use positive logic for ifeq, move ARM handling inside ifeq]
Signed-off-by: David du Colombier <0intro@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/x264/x264.mk b/package/x264/x264.mk
index 35d9fef02a310d64b8889dda5cb2e02184f45437..ac8fe948a4cdc9f5aa647bb681e594f274730200 100644 (file)
--- 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)" \