add ipsec nat traversal patch

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

diff --git a/openwrt/package/zlib/Makefile b/openwrt/package/zlib/Makefile
index 522c1b6..501b137 100644 (file)
--- a/openwrt/package/zlib/Makefile
+++ b/openwrt/package/zlib/Makefile
@@ -1,62 +1,71 @@
+# $Id$
+

 include $(TOPDIR)/rules.mk
 
 include $(TOPDIR)/rules.mk
 

-PKG_NAME := zlib
-PKG_VERSION := 1.2.2
-PKG_RELEASE := 1
+PKG_NAME:=zlib
+PKG_VERSION:=1.2.2
+PKG_RELEASE:=1
+PKG_MD5SUM:=68bd51aaa6558c3bc3fd4890e53413de
+
+PKG_SOURCE_URL:=\
+       http://www.zlib.net/ \
+       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat

 
 

-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 := zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 
 

+IPKG_ZLIB:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+IDIR_ZLIB:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
+INFO_ZLIB:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list

 
 

-$(DL_DIR)/$(PKG_SOURCE_FILE):
-       mkdir -p $(DL_DIR)
-       $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+$(DL_DIR)/$(PKG_SOURCE):
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)

 
 

-$(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
+$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
+       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       $(PATCH) $(PKG_BUILD_DIR) ./patches
+       touch $(PKG_BUILD_DIR)/.prepared

 
 

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

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

-       $(TARGET_CONFIGURE_OPTS) \
-       ./configure \
-         --prefix=/ \
-         --shared)     
+               $(TARGET_CONFIGURE_OPTS) \
+               ./configure \
+               --prefix=/usr \
+               --shared \
+       );

        touch $(PKG_BUILD_DIR)/.configured
 
        touch $(PKG_BUILD_DIR)/.configured
 

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

        $(MAKE) -C $(PKG_BUILD_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR) \

-         $(TARGET_CONFIGURE_OPTS) \
-         CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
-        libz.a libz.so
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+               libz.a libz.so
+       touch $(PKG_BUILD_DIR)/.built

 
 

-$(STAGING_DIR)/lib/libz.so: $(PKG_BUILD_DIR)/libz.so
+$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built

        $(MAKE) -C $(PKG_BUILD_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR) \

-         DESTDIR="$(STAGING_DIR)" \
-         install
+               DESTDIR="$(STAGING_DIR)" \
+               install

 
 

-$(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libz.so
+$(IPKG_ZLIB): $(STAGING_DIR)/usr/lib/libz.so
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_ZLIB) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+       mkdir -p $(IDIR_ZLIB)/usr/lib
+       cp -fpR $(STAGING_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
+       $(STRIP) $(IDIR_ZLIB)/usr/lib/lib*.so*

        mkdir -p $(PACKAGE_DIR)
        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)
-
-
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(STAGING_DIR)/lib/libz.so $(PACKAGE_DIR)/$(PKG_IPK)
-install: $(PKG_ZLIB)
-       $(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK)
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(STAGING_DIR)/lib/libz* $(STAGING_DIR)/include/zlib*
-       rm -f $(PACKAGE_DIR)/zlib\*.ipk
+       $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)

 
 

+$(INFO_ZLIB): $(IPKG_ZLIB)
+       $(IPKG) install $(IPKG_ZLIB)
+
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.prepared
+compile: $(IPKG_ZLIB)
+install: $(INFO_ZLIB)
+
+clean:
+       rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h
+       rm -rf $(STAGING_DIR)/usr/lib/libz.{a,so*}
+       rm -rf $(STAGING_DIR)/usr/share/man/man*/zlib.*
+       rm -rf $(PKG_BUILD_DIR) $(IPKG_ZLIB)