X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ca86d58eaee0780f2883a18f56c720400f31f30d..303152fb3f0cff605e2d7600f6592d5bb4afa616:/package/zlib/Makefile diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 8dc2cc319..099ac0389 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zlib PKG_VERSION:=1.2.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5 -PKG_SOURCE_URL:=http://www.zlib.net/ +PKG_SOURCE_URL:=@SF/zlib PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_CAT:=bzcat @@ -18,16 +18,18 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared +$(PKG_BUILD_DIR)/.configured: (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)/.built: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \ @@ -46,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/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 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 +compile-targets: install-dev +clean-targets: uninstall-dev