X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=tools%2Fxz%2FMakefile;h=4b13f727da4db65336211f3ce66dc24e8f3f2afe;hp=d08d6f899eb387f5be271767c1526cdadceb377f;hb=HEAD;hpb=e68c0a1325f86a757d33d252e687ee7c9f74a8b7

diff --git a/tools/xz/Makefile b/tools/xz/Makefile
index d08d6f899e..4b13f727da 100644
--- a/tools/xz/Makefile
+++ b/tools/xz/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -7,28 +7,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xz
-PKG_VERSION:=5.2.2
+PKG_VERSION:=5.2.5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/lzmautils \
 		http://tukaani.org/xz
-PKG_MD5SUM:=6ff5f57a4b9167155e35e6da8b529de69270efb2b4cf3fbabf41a4ee793840b5
+PKG_HASH:=5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df
+PKG_CPE_ID:=cpe:/a:tukaani:xz
 
 HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
+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
+	--disable-doc \
+	--disable-nls \
+	--with-pic
 
 define Host/Install
 	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat"