Message ID | 20180324142008.10375-7-thomas.petazzoni@bootlin.com |
---|---|
State | Accepted |
Commit | 15815e43ddbb137faca46084f3808f8063bfbffd |
Headers | show |
Series | Preparation for per-package host/target directories | expand |
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes: > This moves the host-xz dependency handling from > DEPENDENCY_HOST_PREREQ to an extract dependency. > To achieve that, check-host-xz.mk fills in the This should be check-host-lzip.mk. > BR2_LZIP_HOST_DEPENDENCY with host-tar if building a host-tar is and host-lzip. Committed with that fixed, thanks.
diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index 4088662de2..72742240a5 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -16,7 +16,7 @@ endef define HOST_LZIP_CONFIGURE_CMDS (cd $(@D); $(HOST_MAKE_ENV) ./configure --prefix=$(HOST_DIR) \ - $(HOST_CONFIGURE_OPTS) ) + $(HOST_CONFIGURE_OPTS) CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)") endef define LZIP_BUILD_CMDS diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b03d7263b1..f03f1d930f 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -559,10 +559,14 @@ ifeq ($(filter host-tar host-skeleton,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY) endif -ifeq ($(filter host-tar host-skeleton host-xz,$(1)),) +ifeq ($(filter host-tar host-skeleton host-xz host-lzip,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_XZCAT_HOST_DEPENDENCY) endif +ifeq ($(filter host-tar host-skeleton host-xz host-lzip,$(1)),) +$(2)_EXTRACT_DEPENDENCIES += $(BR2_LZIP_HOST_DEPENDENCY) +endif + # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) $(2)_FINAL_EXTRACT_DEPENDENCIES = $$(sort $$($(2)_EXTRACT_DEPENDENCIES)) diff --git a/support/dependencies/check-host-lzip.mk b/support/dependencies/check-host-lzip.mk index 00cdd0a236..cdd784058c 100644 --- a/support/dependencies/check-host-lzip.mk +++ b/support/dependencies/check-host-lzip.mk @@ -1,5 +1,5 @@ ifeq (,$(call suitable-host-package,lzip,$(LZCAT))) -DEPENDENCIES_HOST_PREREQ += host-lzip +BR2_LZIP_HOST_DEPENDENCY = host-lzip EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .lz LZCAT = $(HOST_DIR)/bin/lzip -d -c endif