Added support httpd user-agent, IP address binding, closes #265 and #108

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

diff --git a/openwrt/package/zlib/Makefile b/openwrt/package/zlib/Makefile
index 8dc2cc3..cfd8280 100644 (file)
--- a/openwrt/package/zlib/Makefile
+++ b/openwrt/package/zlib/Makefile
@@ -3,11 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib

-PKG_VERSION:=1.2.2
-PKG_RELEASE:=1
-PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5
+PKG_VERSION:=1.2.3
+PKG_RELEASE:=3
+PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6

 
 

-PKG_SOURCE_URL:=http://www.zlib.net/
+PKG_SOURCE_URL:=http://www.zlib.net \
+       @SF/zlib

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 


@@ -18,16 +19,18 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:

        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \

+               LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
+               CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \

                ./configure \
                --prefix=/usr \
                --shared \
        );
        touch $@
 
                ./configure \
                --prefix=/usr \
                --shared \
        );
        touch $@
 

-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:

        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \


@@ -40,22 +43,23 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 
 $(IPKG_ZLIB):
        install -m0755 -d $(IDIR_ZLIB)/usr/lib
 
 $(IPKG_ZLIB):
        install -m0755 -d $(IDIR_ZLIB)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/

        $(RSTRIP) $(IDIR_ZLIB)
        $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        $(RSTRIP) $(IDIR_ZLIB)
        $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h $(STAGING_DIR)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include

        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib

        touch $(STAGING_DIR)/usr/lib/libz.so
        
 install-dev: $(STAGING_DIR)/usr/lib/libz.so
 
 uninstall-dev:
        touch $(STAGING_DIR)/usr/lib/libz.so
        
 install-dev: $(STAGING_DIR)/usr/lib/libz.so
 
 uninstall-dev:

-       rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h
-       rm -rf $(STAGING_DIR)/usr/lib/libz.{a,so*}
+       rm -rf $(STAGING_DIR)/usr/include/zconf.h
+       rm -rf $(STAGING_DIR)/usr/include/zlib.h
+       rm -rf $(STAGING_DIR)/usr/lib/libz.*

 
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev