82 lines
2.3 KiB
Diff
82 lines
2.3 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Sun, 24 Apr 2016 08:44:30 +0200
|
|
Subject: tools: add tar host build, required for --sort=name which was only added in the latest version
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
Backport of r46876
|
|
|
|
diff --git a/tools/Makefile b/tools/Makefile
|
|
index c6cded8eccd81c422f99e7ee50754c4bc66decc7..98ce8c5f1577981136b277a800a3edd5edd4941e 100644
|
|
--- a/tools/Makefile
|
|
+++ b/tools/Makefile
|
|
@@ -81,6 +81,9 @@ endif
|
|
# dependency for tools which have patches directory
|
|
$(foreach tool, $(tools-y), $(if $(wildcard $(curdir)/$(tool)/patches),$(eval $(curdir)/$(tool)/compile += $(curdir)/patch/install)))
|
|
|
|
+$(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/tar/install))
|
|
+tools-y += tar
|
|
+
|
|
$(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
|
|
$(curdir)/builddirs-default := $(tools-y)
|
|
|
|
diff --git a/tools/tar/Makefile b/tools/tar/Makefile
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..975e7835ef09131326ef10a7951c3866d6050801
|
|
--- /dev/null
|
|
+++ b/tools/tar/Makefile
|
|
@@ -0,0 +1,30 @@
|
|
+#
|
|
+# Copyright (C) 2015 OpenWrt.org
|
|
+#
|
|
+# This is free software, licensed under the GNU General Public License v2.
|
|
+# See /LICENSE for more information.
|
|
+#
|
|
+include $(TOPDIR)/rules.mk
|
|
+
|
|
+PKG_NAME:=tar
|
|
+PKG_VERSION:=1.28
|
|
+
|
|
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
|
+PKG_SOURCE_URL:=@GNU/tar
|
|
+PKG_MD5SUM:=49b6306167724fe48f419a33a5beb857
|
|
+
|
|
+HOST_BUILD_PARALLEL := 1
|
|
+
|
|
+include $(INCLUDE_DIR)/host-build.mk
|
|
+
|
|
+HOSTCC := $(HOSTCC_NOCACHE)
|
|
+HOSTCXX := $(HOSTCXX_NOCACHE)
|
|
+
|
|
+HOST_CONFIGURE_ARGS += \
|
|
+ --without-posix-acls \
|
|
+ --without-selinux \
|
|
+ --without-xattrs \
|
|
+ --disable-acl \
|
|
+ --disable-nls
|
|
+
|
|
+$(eval $(call HostBuild))
|
|
diff --git a/tools/tar/patches/100-fix_xattr_disable.patch b/tools/tar/patches/100-fix_xattr_disable.patch
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..5735bd2364a4f324b54a3a49826921ead905d06f
|
|
--- /dev/null
|
|
+++ b/tools/tar/patches/100-fix_xattr_disable.patch
|
|
@@ -0,0 +1,17 @@
|
|
+--- a/lib/xattr-at.c
|
|
++++ b/lib/xattr-at.c
|
|
+@@ -18,6 +18,8 @@
|
|
+
|
|
+ #include <config.h>
|
|
+
|
|
++#ifdef HAVE_XATTRS
|
|
++
|
|
+ #include "xattr-at.h"
|
|
+ #include "openat.h"
|
|
+
|
|
+@@ -108,3 +110,5 @@
|
|
+ #undef AT_FUNC_RESULT
|
|
+ #undef AT_FUNC_POST_FILE_PARAM_DECLS
|
|
+ #undef AT_FUNC_POST_FILE_ARGS
|
|
++
|
|
++#endif
|