X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/640652a244c6916ea5c2a886c52d477d5742e0d8..19c9f8b84c0b8abaa703ca5ae9211ec0cfe9e9c7:/package/zlib/Makefile diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 293462528..97073a10b 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -4,13 +4,12 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=zlib PKG_VERSION:=1.2.3 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib @@ -29,7 +28,7 @@ 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) $(CFLAGS_LARGEFILE)" \ UNAME_S="Linux" \ ./configure \ --prefix=/usr \ @@ -40,7 +39,7 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \ + CFLAGS="$(TARGET_CFLAGS) -fPIC $(CFLAGS_LARGEFILE)" \ libz.a libz.so mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -56,11 +55,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \ $(1)/usr/lib/ endef - -define Build/UninstallDev - rm -rf $(1)/usr/include/z{conf,lib}.h \ - $(1)/usr/lib/libz.{a,so*} -endef # libz.so is needed for openssl (zlib-dynamic) define Package/zlib/install