mirror of
https://github.com/openwrt/packages.git
synced 2026-10-14 07:46:56 +04:00
libtheora: disable ARM assembly on pre-ARMv7 targets only
libtheora's configure probes the host assembler for NEON support
rather than the target CPU, so on pre-ARMv7 (arm926ej-s, etc.) it
falsely succeeds and the build emits NEON the CPU can't execute.
Force --disable-asm only when the ARM target's TARGET_CFLAGS does
not advertise armv7 or armv8, so cortex-a* keeps the NEON path.
Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
(cherry picked from commit 214b265f4a)
This commit is contained in:
1 parent
78c3a34fac
commit
4b080e6351
1 file changed
+5
-2
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libtheora
|
||||
PKG_VERSION:=1.2.0
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=http://downloads.xiph.org/releases/theora/
|
||||
PKG_HASH:=ebdf77a8f5c0a8f7a9e42323844fa09502b34eb1d1fece7b5f54da41fe2122ec
|
||||
@@ -48,9 +48,12 @@ CONFIGURE_ARGS += \
|
||||
--disable-vorbistest \
|
||||
--disable-sdltest
|
||||
|
||||
ifneq ($(findstring armeb,$(CONFIG_ARCH)),)
|
||||
# --disable-asm on pre-ARMv7 ARM so we don't emit assembler which cannot be executed
|
||||
ifeq ($(ARCH),arm)
|
||||
ifeq ($(findstring armv7,$(TARGET_CFLAGS))$(findstring armv8,$(TARGET_CFLAGS)),)
|
||||
CONFIGURE_ARGS += --disable-asm
|
||||
endif
|
||||
endif
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/include/theora/
|
||||
|
||||
Reference in new issue
Block a user