mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
3f5e39e960
Instead of inferring the availability of NEON support from the target
optimization flags, use a preprocessor test to decide whether to enable
ARMv8 NEON optimizations.
Fixes the following build error spotted by the mediatek/32 buildbot:
[ 26%] Building C object CMakeFiles/zlib.dir/contrib/arm/inflate.o
In file included from .../zlib-1.2.11/contrib/arm/chunkcopy.h:10:0,
from .../zlib-1.2.11/contrib/arm/inflate.c:87:
.../arm_neon.h:31:2: error: #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h
#error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h
^
In file included from .../zlib-1.2.11/contrib/arm/inflate.c:87:0:
.../zlib-1.2.11/contrib/arm/chunkcopy.h:18:9: error: unknown type name 'uint8x16_t'
typedef uint8x16_t chunkcopy_chunk_t;
^
[...]
CMakeFiles/zlib.dir/build.make:302: recipe for target 'CMakeFiles/zlib.dir/contrib/arm/inflate.o' failed
Fixes: 3acecba520 "package/libs/zlib: Add ARM and NEON optimizations"
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
101 lines
2.6 KiB
Makefile
101 lines
2.6 KiB
Makefile
#
|
|
# Copyright (C) 2006-2013 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=zlib
|
|
PKG_VERSION:=1.2.11
|
|
PKG_RELEASE:=2
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
|
PKG_SOURCE_URL:=@SF/libpng http://www.zlib.net
|
|
PKG_HASH:=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
|
|
|
|
PKG_LICENSE:=Zlib
|
|
PKG_LICENSE_FILES:=README
|
|
PKG_CPE_ID:=cpe:/a:gnu:zlib
|
|
|
|
PKG_CONFIG_DEPENDS:= CONFIG_ZLIB_OPTIMIZE_SPEED
|
|
|
|
include $(INCLUDE_DIR)/host-build.mk
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/cmake.mk
|
|
|
|
define Package/zlib
|
|
SECTION:=libs
|
|
CATEGORY:=Libraries
|
|
TITLE:=Library implementing the deflate compression method
|
|
URL:=http://www.zlib.net/
|
|
endef
|
|
|
|
define Package/zlib-dev
|
|
SECTION:=devel
|
|
CATEGORY:=Development
|
|
SUBMENU:=Libraries
|
|
DEPENDS:=zlib
|
|
TITLE:=Development files for the zlib library
|
|
endef
|
|
|
|
define Package/zlib/description
|
|
zlib is a lossless data-compression library.
|
|
This package includes the shared library.
|
|
endef
|
|
|
|
define Package/zlib-dev/description
|
|
zlib is a lossless data-compression library.
|
|
This package includes the development support files.
|
|
endef
|
|
|
|
define Package/zlib/config
|
|
source "$(SOURCE)/Config.in"
|
|
endef
|
|
|
|
TARGET_CFLAGS += $(FPIC)
|
|
|
|
ifeq ($(CONFIG_ZLIB_OPTIMIZE_SPEED),y)
|
|
TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) -O3
|
|
endif
|
|
|
|
CMAKE_OPTIONS += \
|
|
-DARMv8=$$$$(echo -e '\#ifdef __ARM_NEON__\nON\n\#else\nOFF\n\#endif' | $$(TARGET_CC) $$(TARGET_CFLAGS) -x c -E - | grep -xE 'ON|OFF')
|
|
|
|
define Build/InstallDev
|
|
mkdir -p $(1)/usr/include
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \
|
|
$(1)/usr/include/
|
|
mkdir -p $(1)/usr/lib
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
|
|
$(1)/usr/lib/
|
|
mkdir -p $(1)/usr/lib/pkgconfig
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/zlib.pc \
|
|
$(1)/usr/lib/pkgconfig/
|
|
endef
|
|
|
|
# libz.so is needed for openssl (zlib-dynamic)
|
|
define Package/zlib/install
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so $(1)/usr/lib/
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
|
|
endef
|
|
|
|
define Package/zlib-dev/install
|
|
$(INSTALL_DIR) $(1)/usr/include
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/zconf.h \
|
|
$(1)/usr/include/
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/zlib.h \
|
|
$(1)/usr/include/
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.a $(1)/usr/lib/
|
|
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/zlib.pc \
|
|
$(1)/usr/lib/pkgconfig/
|
|
endef
|
|
|
|
$(eval $(call HostBuild))
|
|
$(eval $(call BuildPackage,zlib))
|
|
$(eval $(call BuildPackage,zlib-dev))
|