X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fxz%2FMakefile;h=3afc108fbbcfaa39cca5eb8545d827b842e71ddd;hb=720b99215da295a2e7b4acdef30b58bec6acedc2;hp=7298630882b055e96e9fa0d25ce071b9246c2446;hpb=958a9c96cd631d9eb0cd7e8575d62b7d9fdc32fb;p=openwrt%2Fstaging%2Flynxis%2Fomap.git

diff --git a/tools/xz/Makefile b/tools/xz/Makefile
index 7298630882..3afc108fbb 100644
--- a/tools/xz/Makefile
+++ b/tools/xz/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,19 +7,34 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xz
-PKG_VERSION:=5.0.4
+PKG_VERSION:=5.2.2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://tukaani.org/xz
-PKG_MD5SUM:=741cd3a5f64b23b7bac56ec5b2258715
+PKG_SOURCE_URL:=@SF/lzmautils \
+		http://tukaani.org/xz
+PKG_HASH:=6ff5f57a4b9167155e35e6da8b529de69270efb2b4cf3fbabf41a4ee793840b5
+
+HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+HOSTCC := $(HOSTCC_NOCACHE)
+HOSTCXX := $(HOSTCXX_NOCACHE)
+
+HOST_CONFIGURE_ARGS += \
+	--enable-static=yes \
+	--enable-shared=no \
+
+define Host/Prepare
+	$(call Host/Prepare/Default)
+
+	# FreeBSD portability fix
+	sed -i -e 's|#if defined(HAVE_BYTESWAP_H)|& \&\& !defined(__FreeBSD__)|' \
+		$(HOST_BUILD_DIR)/src/common/tuklib_integer.h
+endef
 
 define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" \
-		AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)"
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat"
 endef
 
 $(eval $(call HostBuild))