X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c0acc674e499f0011aa6f97c4aaa80fb97d9319a..e52db1fca3c7f3f26891aed6a4fb4f23f5a1ae0a:/package/zlib/Makefile?ds=sidebyside diff --git a/package/zlib/Makefile b/package/zlib/Makefile index c311acbb9..2d88d51a2 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -4,14 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zlib PKG_VERSION:=1.2.2 -PKG_RELEASE:=1 -PKG_MD5SUM:=68bd51aaa6558c3bc3fd4890e53413de +PKG_RELEASE:=2 +PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5 -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_URL:=@SF/zlib +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install @@ -23,11 +21,13 @@ $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared (cd $(PKG_BUILD_DIR); \ $(TARGET_CONFIGURE_OPTS) \ + LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \ + CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \ ./configure \ --prefix=/usr \ --shared \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -38,7 +38,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ install - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_ZLIB): install -m0755 -d $(IDIR_ZLIB)/usr/lib @@ -48,16 +48,17 @@ $(IPKG_ZLIB): $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h $(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/libz.{a,so*} $(STAGING_DIR)/usr/include + 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 uninstall-dev: - rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h - rm -rf $(STAGING_DIR)/usr/lib/libz.{a,so*} + rm -rf $(STAGING_DIR)/usr/include/zconf.h + rm -rf $(STAGING_DIR)/usr/include/zlib.h + rm -rf $(STAGING_DIR)/usr/lib/libz.* compile: install-dev clean: uninstall-dev