X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/df1d9706f4e8dc21c18dd210c16cef8620ca7efe..d75add62a3ee1f64bb82d05977d21c0c1320b9de:/package/zlib/Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 26802ae53..cfd82800a 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -2,66 +2,64 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := zlib
-PKG_VERSION := 1.2.2
-PKG_RELEASE := 1
-PKG_MD5SUM := 68bd51aaa6558c3bc3fd4890e53413de
+PKG_NAME:=zlib
+PKG_VERSION:=1.2.3
+PKG_RELEASE:=3
+PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 
-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_URL:=http://www.zlib.net \
+	@SF/zlib
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-	mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
+include $(TOPDIR)/package/rules.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
+$(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); \
-	$(TARGET_CONFIGURE_OPTS) \
-	./configure \
-	  --prefix=/ \
-	  --shared)	
-	touch $(PKG_BUILD_DIR)/.configured
+		$(TARGET_CONFIGURE_OPTS) \
+		LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
+		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+		./configure \
+		--prefix=/usr \
+		--shared \
+	);
+	touch $@
 
-$(PKG_BUILD_DIR)/libz.so: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-	  $(TARGET_CONFIGURE_OPTS) \
-	  CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
-	 libz.a libz.so
-
-$(STAGING_DIR)/lib/libz.so: $(PKG_BUILD_DIR)/libz.so
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+		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)
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install
+	touch $@
 
-$(IPKG_STATE_DIR)/info/zlib.list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
+$(IPKG_ZLIB):
+	install -m0755 -d $(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)
 
-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
+$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include
+	mkdir -p $(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
 
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(STAGING_DIR)/lib/libz* $(STAGING_DIR)/include/zlib*
-	rm -f $(PACKAGE_DIR)/zlib\*.ipk
+uninstall-dev:
+	rm -rf $(STAGING_DIR)/usr/include/zconf.h
+	rm -rf $(STAGING_DIR)/usr/include/zlib.h
+	rm -rf $(STAGING_DIR)/usr/lib/libz.*
 
+compile-targets: install-dev
+clean-targets: uninstall-dev