X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d30a5f1bf1bdd49ea908c138ab37d85d3e5d4e33..3d9b27b735b76d16c6bad5dc202a731883e7b888:/package/zlib/Makefile?ds=inline diff --git a/package/zlib/Makefile b/package/zlib/Makefile index da9e6f461..d8213b972 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -1,46 +1,46 @@ -# $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.3 -PKG_RELEASE:=3 +PKG_RELEASE:=5 -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_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 +include $(INCLUDE_DIR)/package.mk define Package/zlib -SECTION:=base -CATEGORY:=Libraries -DEFAULT:=n -TITLE:=Library implementing the deflate compression method -DESCRIPTION:=A library implementing the 'deflate' compression method -URL:=http://www.zlib.net/ + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Library implementing the deflate compression method + URL:=http://www.zlib.net/ endef 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 \ ); endef 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) \ @@ -48,27 +48,20 @@ define Build/Compile install endef -define Package/zlib/install - install -m0755 -d $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/ -endef - define Build/InstallDev - mkdir -p $(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) $(PKG_INSTALL_DIR)/usr/lib/libz.a \ - $(PKG_INSTALL_DIR)/usr/lib/libz.so* \ - $(STAGING_DIR)/usr/lib/ + 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 - -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* + +# 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))