aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/xz/Makefile12
-rw-r--r--tools/xz/patches/100-freebsd-compat.patch11
2 files changed, 10 insertions, 13 deletions
diff --git a/tools/xz/Makefile b/tools/xz/Makefile
index 1bccbdb263..d08d6f899e 100644
--- a/tools/xz/Makefile
+++ b/tools/xz/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=xz
PKG_VERSION:=5.2.2
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/lzmautils \
http://tukaani.org/xz
-PKG_MD5SUM:=f341b1906ebcdde291dd619399ae944600edc9193619dd0c0110a5f05bfcc89e
+PKG_MD5SUM:=6ff5f57a4b9167155e35e6da8b529de69270efb2b4cf3fbabf41a4ee793840b5
HOST_BUILD_PARALLEL:=1
@@ -22,6 +22,14 @@ 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) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat"
endef
diff --git a/tools/xz/patches/100-freebsd-compat.patch b/tools/xz/patches/100-freebsd-compat.patch
deleted file mode 100644
index 480a65293a..0000000000
--- a/tools/xz/patches/100-freebsd-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/common/tuklib_integer.h
-+++ b/src/common/tuklib_integer.h
-@@ -48,7 +48,7 @@
- // Operating system specific features //
- ////////////////////////////////////////
-
--#if defined(HAVE_BYTESWAP_H)
-+#if defined(HAVE_BYTESWAP_H) && !defined(__FreeBSD__)
- // glibc, uClibc, dietlibc
- # include <byteswap.h>
- # ifdef HAVE_BSWAP_16