X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f77b88d124ea1c900f9cf5e04046939aad48bbe1..86143fe01068cd4a7703629b88ce41e51bccb03b:/package/zlib/Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 522c1b675..d8213b972 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -1,62 +1,67 @@
-include $(TOPDIR)/rules.mk
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
-PKG_NAME := zlib
-PKG_VERSION := 1.2.2
-PKG_RELEASE := 1
+include $(TOPDIR)/rules.mk
 
-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_NAME:=zlib
+PKG_VERSION:=1.2.3
+PKG_RELEASE:=5
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
+PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 
-$(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
+		$(TARGET_CONFIGURE_OPTS) \
+		LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
+		CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
+		UNAME_S="Linux" \
+		./configure \
+			--prefix=/usr \
+			--shared \
+	);
+endef
 
-$(PKG_BUILD_DIR)/libz.so: $(PKG_BUILD_DIR)/.configured
+define Build/Compile
 	$(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) \
+		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
-
-$(PACKAGE_DIR)/$(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)
-
-
-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
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install
+endef
+
+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
+
+# 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))