mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 00:20:38 -09:00
package/libde265: disable neon support for armv7m
Buildroot commitd4b8a42fb2bumped the package from 1.0.16 to 1.0.18. Upstream added optional neon support in version 1.0.17:f22cf00a86The configure check detects neon support: -- Performing Test HAVE_NEON -- Performing Test HAVE_NEON - Success but causes a build error at linking stage: [100%] Linking CXX executable dec265 /builds/bkuhls/buildroot/br-test-pkg/bootlin-armv7m-uclibc/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: error: ../libde265/libde265.a(hevcdsp_qpel_neon.S.o): conflicting architecture profiles A/M so we add a configure option to disable neon support. The build error was not yet detected by the autobuilders but can be reproduced using this defconfig: BR2_arm=y BR2_cortex_m4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE=y BR2_PACKAGE_LIBDE265=y Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commitf51769b7e9) Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
committed by
Thomas Perale
parent
3b435a1bab
commit
b362fa37e3
@@ -16,4 +16,8 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
LIBDE265_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_ARM_CPU_ARMV7M):$(BR2_ARM_CPU_HAS_NEON),y:)
|
||||
LIBDE265_CONF_OPTS += -DHAVE_NEON=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user