X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/fa45f478b0fa5e5109904c75de9c3b54dc63ba3e..51c76d8aa5224233370fa5de9cc1277f5a797a66:/package/zlib/Makefile diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 2d88d51a2..c6a18378d 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -1,64 +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:=2 -PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5 +PKG_VERSION:=1.2.3 +PKG_RELEASE:=5 -PKG_SOURCE_URL:=@SF/zlib PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_CAT:=bzcat +PKG_SOURCE_URL:=http://www.zlib.net @SF/libpng +PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/package/rules.mk +define Package/zlib + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Library implementing the deflate compression method + URL:=http://www.zlib.net/ +endef -$(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(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)" \ + CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ + UNAME_S="Linux" \ ./configure \ - --prefix=/usr \ - --shared \ + --prefix=/usr \ + --shared \ ); - touch $@ +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 mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ install - touch $@ - -$(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) +endef -$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built - mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include - mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib - touch $(STAGING_DIR)/usr/lib/libz.so - -install-dev: $(STAGING_DIR)/usr/lib/libz.so +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 -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.* +# 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 -compile: install-dev -clean: uninstall-dev +$(eval $(call BuildPackage,zlib))