package/apex: fix a compile issue

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

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index c6a18378dce9c8c8b3c67009babeec08fdf34abb..5cea85fc85e774b7d6657b8c0234567efa03ee01 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -8,12 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
-PKG_VERSION:=1.2.3
-PKG_RELEASE:=5
+PKG_VERSION:=1.2.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net @SF/libpng
-PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
+PKG_MD5SUM:=be1e89810e66150f5b0327984d8625a0
+
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -29,19 +31,18 @@ define Build/Configure
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
                CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
-               UNAME_S="Linux" \
                ./configure \
                        --prefix=/usr \
                        --shared \
+                       --uname=Linux \
        );
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
-               LDSHARED="$(TARGET_CROSS)ld -shared" \
-               CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
-               libz.a libz.so
+               CFLAGS="$(TARGET_CFLAGS)" \
+               libz.a libz.so.$(PKG_VERSION)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \