[Buildroot] [PATCH v3] x264: use assembly files on ARMv7

Peter Korsgaard jacmet at uclibc.org
Sat Oct 11 11:22:36 UTC 2014


>>>>> "David" == David du Colombier <0intro at gmail.com> writes:

 > Signed-off-by: David du Colombier <0intro at 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 35d9fef..e5fa856 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)
 >  X264_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 \

As this is only for ARM, I prefer to move it to the ifeq above (and make
the check use positive logic).

Committed with that fixed, thanks.

-- 
Bye, Peter Korsgaard



More information about the buildroot mailing list