package/libs/zlib: Add ARM and NEON optimizations

[openwrt/openwrt.git] / package / libs / zlib / Makefile

diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
index 902381bdeaa7b79c439c3e9cddc898ce4076006d..3602e629cf4a9ec2029acd8adb49a782e69f1fc2 100644 (file)
--- a/package/libs/zlib/Makefile
+++ b/package/libs/zlib/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/libpng http://www.zlib.net
@@ -17,8 +17,10 @@ PKG_HASH:=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
 
 PKG_LICENSE:=Zlib
 PKG_LICENSE_FILES:=README
+PKG_CPE_ID:=cpe:/a:gnu:zlib
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/zlib
   SECTION:=libs
@@ -45,28 +47,12 @@ define Package/zlib-dev/description
  This package includes the development support files.
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); \
-               $(TARGET_CONFIGURE_OPTS) \
-               LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
-               CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
-               ./configure \
-                       --prefix=/usr \
-                       --shared \
-                       --uname=Linux \
-       );
-endef
+TARGET_CFLAGS += $(FPIC)
 
-define Build/Compile
-       +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               libz.a libz.so.$(PKG_VERSION)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-endef
+ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
+       CMAKE_OPTIONS += \
+               -DARMv8=ON
+endif
 
 define Build/InstallDev
        mkdir -p $(1)/usr/include
@@ -76,7 +62,7 @@ define Build/InstallDev
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
                $(1)/usr/lib/
        mkdir -p $(1)/usr/lib/pkgconfig
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zlib.pc \
+       $(CP)   $(PKG_INSTALL_DIR)/usr/share/pkgconfig/zlib.pc \
                $(1)/usr/lib/pkgconfig/
 endef
 
@@ -96,7 +82,7 @@ define Package/zlib-dev/install
        $(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/lib/pkgconfig/zlib.pc \
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/zlib.pc \
          $(1)/usr/lib/pkgconfig/
 endef