diff options
| -rw-r--r-- | fs/tar/tar.mk | 2 | ||||
| -rw-r--r-- | package/pkg-generic.mk | 4 | ||||
| -rw-r--r-- | package/tar/tar.mk | 5 | ||||
| -rw-r--r-- | support/dependencies/check-host-tar.mk | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk index e39c2fdbf1..68149e9eb7 100644 --- a/fs/tar/tar.mk +++ b/fs/tar/tar.mk @@ -6,6 +6,8 @@ TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS)) +ROOTFS_TAR_DEPENDENCIES = $(BR2_TAR_HOST_DEPENDENCY) + define ROOTFS_TAR_CMD (cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \ tar $(TAR_OPTS) -cf $@ --null --no-recursion -T - --numeric-owner) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 0a404040b0..ae50c5f284 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -555,6 +555,10 @@ ifneq ($(1),host-skeleton) $(2)_DEPENDENCIES += host-skeleton endif +ifeq ($(filter host-tar host-skeleton,$(1)),) +$(2)_EXTRACT_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY) +endif + # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) $(2)_FINAL_EXTRACT_DEPENDENCIES = $$(sort $$($(2)_EXTRACT_DEPENDENCIES)) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index a8a15d9518..92b6e9eaa5 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -47,4 +47,9 @@ endef HOST_TAR_CONF_OPTS = --without-selinux +# we are built before ccache +HOST_TAR_CONF_ENV = \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + $(eval $(host-autotools-package)) diff --git a/support/dependencies/check-host-tar.mk b/support/dependencies/check-host-tar.mk index ad0b32e277..07d02fd1b1 100644 --- a/support/dependencies/check-host-tar.mk +++ b/support/dependencies/check-host-tar.mk @@ -1,6 +1,6 @@ TAR ?= tar ifeq (,$(call suitable-host-package,tar,$(TAR))) -DEPENDENCIES_HOST_PREREQ += host-tar TAR = $(HOST_DIR)/bin/tar +BR2_TAR_HOST_DEPENDENCY = host-tar endif |
