X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fzlib%2FMakefile;h=33cbcceb276dd3c3172104d667e2f25d3d76c9f1;hb=cff40066b4e9aef995b0135718dc49ad3e652674;hp=c311acbb9ce7a9708a59bddd3441b87b4c104d19;hpb=c0acc674e499f0011aa6f97c4aaa80fb97d9319a;p=openwrt.git

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index c311acbb9c..33cbcceb27 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -3,33 +3,40 @@
 include $(TOPDIR)/rules.mk
 
 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_VERSION:=1.2.3
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.zlib.net \
+	@SF/zlib
+PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
+PKG_CAT:=bzcat
+
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/zlib
+SECTION:=base
+CATEGORY:=Libraries
+TITLE:=Library implementing the deflate compression method
+DESCRIPTION:=A library implementing the 'deflate' compression method
+URL:=http://www.zlib.net/
+endef
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+define Build/Configure
 	(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 $(PKG_BUILD_DIR)/.configured
+endef
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
@@ -38,26 +45,29 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		install
-	touch $(PKG_BUILD_DIR)/.built
+endef
 
-$(IPKG_ZLIB):
-	install -m0755 -d $(IDIR_ZLIB)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
-	$(RSTRIP) $(IDIR_ZLIB)
-	$(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)
+define Package/zlib/install
+	install -m0755 -d $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
+endef
 
-$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
+define Build/InstallDev
 	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/zconf.h \
+		$(PKG_INSTALL_DIR)/usr/include/zlib.h \
+		$(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} $(STAGING_DIR)/usr/include
-	touch $(STAGING_DIR)/usr/lib/libz.so
+	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libz.a \
+		$(PKG_INSTALL_DIR)/usr/lib/libz.so* \
+		$(STAGING_DIR)/usr/lib/
+endef
 	
-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*}
+define Build/UninstallDev
+	rm -rf	$(STAGING_DIR)/usr/include/zconf.h \
+		$(STAGING_DIR)/usr/include/zlib.h \
+		$(STAGING_DIR)/usr/lib/libz.a \
+		$(STAGING_DIR)/usr/lib/libz.so*
+endef
 
-compile: install-dev
-clean: uninstall-dev
+$(eval $(call BuildPackage,zlib))