From mboxrd@z Thu Jan 1 00:00:00 1970 From: David du Colombier <0intro@gmail.com> Date: Thu, 9 Oct 2014 10:08:11 +0200 Subject: [Buildroot] [PATCH v2] x264: use assembly files on ARMv7 Message-ID: <1412842091-15386-1-git-send-email-0intro@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Signed-off-by: David du Colombier <0intro@gmail.com> --- package/x264/x264.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/x264/x264.mk b/package/x264/x264.mk index c2397f8..713e37e 100644 --- a/package/x264/x264.mk +++ b/package/x264/x264.mk @@ -14,7 +14,7 @@ X264_INSTALL_STAGING = YES ifeq ($(BR2_i386)$(BR2_x86_64),y) FFMPEG_DEPENDENCIES += host-yasm -else +else ifeq ($(BR2_cortex_a5)$(BR2_cortex_a7)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a12)$(BR2_cortex_a15),) X264_CONF_OPTS += --disable-asm endif @@ -30,9 +30,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) X264_CONF_OPTS += --disable-thread endif -# the configure script is not generated by autoconf +# The configure script is not generated by autoconf. +# We need to pass gcc as AS, because the ARM assembly +# files have to be preprocessed. define X264_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure \ + (cd $(@D); $(TARGET_CONFIGURE_OPTS) AS="$(TARGET_CC)" ./configure \ --prefix=/usr \ --host="$(GNU_TARGET_NAME)" \ --cross-prefix="$(TARGET_CROSS)" \ -- 1.9.3