X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/8e85aed5aa25e3d0d8d2f569df9e4aa037ce2cce..cccec9f4b412fdbd076e384bb1eb89e5edcee6f5:/package/zlib/Makefile diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 19dc3e65b..d8213b972 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -4,7 +4,6 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk @@ -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) -fPIC $(CFLAGS_LARGEFILE)" \ + CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ UNAME_S="Linux" \ ./configure \ --prefix=/usr \ @@ -40,7 +39,8 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -fPIC $(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) \ @@ -56,11 +56,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