X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f269a04bb6614e6274ec7abf6b4c4ca4abe780ea..3d9b27b735b76d16c6bad5dc202a731883e7b888:/package/zlib/Makefile?ds=sidebyside diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 5e05915e2..d8213b972 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -1,71 +1,67 @@ -# $Id$ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk PKG_NAME:=zlib -PKG_VERSION:=1.2.2 -PKG_RELEASE:=1 -PKG_MD5SUM:=68bd51aaa6558c3bc3fd4890e53413de +PKG_VERSION:=1.2.3 +PKG_RELEASE:=5 -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:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib +PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +include $(INCLUDE_DIR)/package.mk -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 +define Package/zlib + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Library implementing the deflate compression method + URL:=http://www.zlib.net/ +endef -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) - -$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch - touch $(PKG_BUILD_DIR)/.prepared - -$(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) $(FPIC)" \ + UNAME_S="Linux" \ ./configure \ - --prefix=/usr \ - --shared \ + --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)" \ + LDSHARED="$(TARGET_CROSS)ld -shared" \ + CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ libz.a libz.so - touch $(PKG_BUILD_DIR)/.built - -$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(STAGING_DIR)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ install +endef -$(IPKG_ZLIB): $(STAGING_DIR)/usr/lib/libz.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_ZLIB) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(IDIR_ZLIB)/usr/lib - cp -a $(STAGING_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ - $(STRIP) $(IDIR_ZLIB)/usr/lib/lib*.so* - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR) - -$(INFO_ZLIB): $(IPKG_ZLIB) - $(IPKG) install $(IPKG_ZLIB) +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 -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.prepared -compile: $(IPKG_ZLIB) -install: $(INFO_ZLIB) +# 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 -clean: - -$(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(STAGING_DIR)" \ - uninstall - rm -rf $(PKG_BUILD_DIR) $(IPKG_ZLIB) +$(eval $(call BuildPackage,zlib))