|
@@ -14,9 +14,15 @@ X264_INSTALL_STAGING = YES
|
|
X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale
|
|
X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale
|
|
|
|
|
|
ifeq ($(BR2_i386)$(BR2_x86_64),y)
|
|
ifeq ($(BR2_i386)$(BR2_x86_64),y)
|
|
|
|
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_PIC_PIE),yy)
|
|
|
|
+# libx264 uses large amounts of non-pic assembly code, resulting in text
|
|
|
|
+# section relocations, which are not supported on musl-libc's ld.so.
|
|
|
|
+X264_CONF_OPTS += --disable-asm
|
|
|
|
+else
|
|
# nasm needed for assembly files
|
|
# nasm needed for assembly files
|
|
X264_DEPENDENCIES += host-nasm
|
|
X264_DEPENDENCIES += host-nasm
|
|
X264_CONF_ENV += AS="$(HOST_DIR)/bin/nasm"
|
|
X264_CONF_ENV += AS="$(HOST_DIR)/bin/nasm"
|
|
|
|
+endif
|
|
else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y)
|
|
else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y)
|
|
# We need to pass gcc as AS, because the ARM assembly files have to be
|
|
# We need to pass gcc as AS, because the ARM assembly files have to be
|
|
# preprocessed
|
|
# preprocessed
|