[package] uhttpd: break tight loop when receiving eof during header reading (#7904)

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 6d9144f..bcd6ae0 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -1,64 +1,69 @@
+# 
+# Copyright (C) 2006 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.2
-PKG_RELEASE := 1
+PKG_NAME:=zlib
+PKG_VERSION:=1.2.3
+PKG_RELEASE:=5
 
-PKG_SOURCE_SITE := http://www.zlib.net/
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
-PKG_IPK := $(PACKAGE_DIR)/zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.zlib.net @SF/libpng
+PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 
+PKG_BUILD_PARALLEL:=1
 
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-       mkdir -p $(DL_DIR)
-       $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+include $(INCLUDE_DIR)/package.mk
 
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
-       mkdir -p $(TOOL_BUILD_DIR)
-       $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch
-       touch $(PKG_BUILD_DIR)/.patched
+define Package/zlib
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library implementing the deflate compression method
+  URL:=http://www.zlib.net/
+endef
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
+define Build/Configure
        (cd $(PKG_BUILD_DIR); \
-       $(TARGET_CONFIGURE_OPTS) \
-       ./configure \
-         --prefix=/ \
-         --shared)     
-       touch $(PKG_BUILD_DIR)/.configured
-
-$(PKG_BUILD_DIR)/libz.so: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-         $(TARGET_CONFIGURE_OPTS) \
-         CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
-        libz.a libz.so
+               $(TARGET_CONFIGURE_OPTS) \
+               LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
+               CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
+               UNAME_S="Linux" \
+               ./configure \
+                       --prefix=/usr \
+                       --shared \
+       );
+endef
 
-$(STAGING_DIR)/lib/libz.so: $(PKG_BUILD_DIR)/libz.so
+define Build/Compile
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               LDSHARED="$(TARGET_CROSS)ld -shared" \
+               CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
+               libz.a libz.so
+       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
-         DESTDIR="$(STAGING_DIR)" \
-         install
-
-$(PKG_IPK): $(STAGING_DIR)/lib/libz.so
-       mkdir -p $(PACKAGE_DIR)
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/zlib zlib.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib
-       cp -a $(PKG_BUILD_DIR)/libz.so* $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib
-       $(STRIP) $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib/*
-       $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/zlib $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/zlib.list: $(PKG_IPK)
-       $(IPKG) install $(PKG_IPK)
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               install
+endef
 
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(STAGING_DIR)/lib/libz.so $(PKG_IPK)
-install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/zlib.list
+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/
+endef
 
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(STAGING_DIR)/lib/libz* $(STAGING_DIR)/include/zlib*
-       rm -f $(PACKAGE_DIR)/zlib\*.ipk
+# 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
 
+$(eval $(call BuildPackage,zlib))