treewide: Update ARM NEON/VFP detection

With openwrt/openwrt@8dcc108760, the ARM
FPU compiler options are no longer part of CONFIG_TARGET_OPTIMIZATION.

This updates various packages that look for NEON/VFP support to search
CONFIG_CPU_TYPE instead.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To
2020-05-11 03:02:05 +08:00
parent b7c59c390f
commit 2d99ee3004
5 changed files with 13 additions and 15 deletions

View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mpg123
PKG_VERSION:=1.25.13
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/mpg123
@@ -67,16 +67,14 @@ ifeq ($(CONFIG_SOFT_FLOAT),y)
CONFIGURE_ARGS+= \
--with-cpu=generic_nofpu \
--enable-int-quality=yes
else ifneq ($(findstring neon,$(CONFIG_CPU_TYPE)),)
CONFIGURE_ARGS+= \
--with-cpu=arm_fpu
else
CONFIGURE_ARGS+= \
--with-cpu=generic_fpu
endif
ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
CONFIGURE_ARGS+= \
--with-cpu=arm_fpu
endif
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(INSTALL_DATA) \

View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pulseaudio
PKG_VERSION:=13.0
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases
@@ -148,7 +148,7 @@ TARGET_LDFLAGS += -Wl,--gc-sections -liconv
define Build/Prepare
$(call Build/Prepare/Default)
ifneq ($(findstring arm,$(CONFIG_ARCH)),)
ifeq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
ifeq ($(findstring neon,$(CONFIG_CPU_TYPE)),)
$(SED) '/remap_neon\.c/d' $(PKG_BUILD_DIR)/src/pulsecore/meson.build
endif
endif