d29b105318
Fixes: http://autobuild.buildroot.net/results/3ec/3ec54f722d6008fc422540d3a5462b306d16e84c/ The recent x264 version bump broke the configure step on x86/x86-64 as x264 ends up using gas instead of yasm as assembler. The reason for this is the recent upstream commit to optionally use nasm instead of yasm if AS= is passed: commit b568a256b9bc6c500d7b1ffe4b9c3311ee5ff337 Author: Henrik Gramner <henrik@gramner.com> Date: Sat May 23 19:44:16 2015 +0200 x86: Experimental nasm support Enables the use of nasm as an alternative to yasm. Note that nasm cannot assemble x264 with PIC enabled since it currently doesn't support [symbol-$$] addressing which is used extensively by x264's PIC code. This includes all 64-bit Windows and 64-bit OS X builds, even non-shared. For the above reason nasm is currently intentionally not auto-detected, instead the assembler must be explicitly specified using "AS=nasm ./configure". Also drop -O2 from ASFLAGS since it's simply ignored anyway. But as we pass AS=$(TARGET_AS) it ends up using gas instead. Fix it by explicitly passing AS=yasm instead. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
65 lines
1.6 KiB
Makefile
65 lines
1.6 KiB
Makefile
################################################################################
|
|
#
|
|
# x264
|
|
#
|
|
################################################################################
|
|
|
|
X264_VERSION = e86f3a1993234e8f26050c243aa253651200fa6b
|
|
X264_SITE = git://git.videolan.org/x264.git
|
|
X264_LICENSE = GPLv2+
|
|
X264_DEPENDENCIES = host-pkgconf
|
|
X264_LICENSE_FILES = COPYING
|
|
X264_INSTALL_STAGING = YES
|
|
X264_CONF_OPTS = --disable-avs
|
|
|
|
ifeq ($(BR2_i386)$(BR2_x86_64),y)
|
|
# yasm needed for assembly files
|
|
X264_DEPENDENCIES += host-yasm
|
|
X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/yasm"
|
|
else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),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
|
|
|
|
ifeq ($(BR2_STATIC_LIBS),)
|
|
X264_CONF_OPTS += --enable-pic --enable-shared
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_X264_CLI),)
|
|
X264_CONF_OPTS += --disable-cli
|
|
endif
|
|
|
|
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
|
|
X264_CONF_OPTS += --disable-thread
|
|
endif
|
|
|
|
# the configure script is not generated by autoconf
|
|
define X264_CONFIGURE_CMDS
|
|
(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(X264_CONF_ENV) ./configure \
|
|
--prefix=/usr \
|
|
--host="$(GNU_TARGET_NAME)" \
|
|
--cross-prefix="$(TARGET_CROSS)" \
|
|
--disable-ffms \
|
|
--enable-static \
|
|
--disable-opencl \
|
|
$(X264_CONF_OPTS) \
|
|
)
|
|
endef
|
|
|
|
define X264_BUILD_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
|
endef
|
|
|
|
define X264_INSTALL_STAGING_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D) install
|
|
endef
|
|
|
|
define X264_INSTALL_TARGET_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install
|
|
endef
|
|
|
|
$(eval $(generic-package))
|