[RFCv3,09/15] package/pkg-generic: handle host-lzip as an extract dependency

Message ID 20171201205352.24287-10-thomas.petazzoni@free-electrons.com
State Superseded
Headers show
Series
  • Per-package host/target directory support
Related show

Commit Message

Thomas Petazzoni Dec. 1, 2017, 8:53 p.m.
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
BR2_LZIP_HOST_DEPENDENCY with host-tar if building a host-tar is
needed. The name BR2_LZIP_HOST_DEPENDENCY has been chosen because it
matches the name BR2_CMAKE_HOST_DEPENDENCY already used in
check-host-cmake.mk.

The BR2_LZIP_HOST_DEPENDENCY is added to all packages, except:

 - host-lzip, because we would otherwise depend on ourself.

 - host-tar, because lzip itself is delivered as a tarball, so we need
   to have host-lzip depend on host-tar, and not host-tar depend on
   host-lzip

 - host-skeleton, because we need to have host-lzip depend on
   host-skeleton, and not the opposite.

We also mutually exclude host-lzip and host-xz from dependending on
each other, to avoid a circular dependency.

In addition, we modify lzip.mk to explicitly build host-lzip without
ccache. We generally took the approach of building host-ccache *after*
all the extractors have been built.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Changes since v2:
 - New patch
---
 package/lzip/lzip.mk                    | 2 +-
 package/pkg-generic.mk                  | 6 +++++-
 support/dependencies/check-host-lzip.mk | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

Comments

Yann E. MORIN Dec. 2, 2017, 3:12 p.m. | #1
Thomas, All,

On 2017-12-01 21:53 +0100, Thomas Petazzoni spake thusly:
> 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
> BR2_LZIP_HOST_DEPENDENCY with host-tar if building a host-tar is
> needed. The name BR2_LZIP_HOST_DEPENDENCY has been chosen because it
> matches the name BR2_CMAKE_HOST_DEPENDENCY already used in
> check-host-cmake.mk.
> 
> The BR2_LZIP_HOST_DEPENDENCY is added to all packages, except:

So even when no package compresed with lzip is enabled?

That was a gripe of yours, that host-lzip was always built even when not
needed...

Regards,
Yann E. MORIN.

>  - host-lzip, because we would otherwise depend on ourself.
> 
>  - host-tar, because lzip itself is delivered as a tarball, so we need
>    to have host-lzip depend on host-tar, and not host-tar depend on
>    host-lzip
> 
>  - host-skeleton, because we need to have host-lzip depend on
>    host-skeleton, and not the opposite.
> 
> We also mutually exclude host-lzip and host-xz from dependending on
> each other, to avoid a circular dependency.
> 
> In addition, we modify lzip.mk to explicitly build host-lzip without
> ccache. We generally took the approach of building host-ccache *after*
> all the extractors have been built.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> Changes since v2:
>  - New patch
> ---
>  package/lzip/lzip.mk                    | 2 +-
>  package/pkg-generic.mk                  | 6 +++++-
>  support/dependencies/check-host-lzip.mk | 2 +-
>  3 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk
> index b7ba5dd21d..a16a22214c 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 dfd4719d29..e623afe7bc 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -591,10 +591,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
> -- 
> 2.13.6
>
Thomas Petazzoni Dec. 2, 2017, 8:13 p.m. | #2
Hello,

On Sat, 2 Dec 2017 16:12:24 +0100, Yann E. MORIN wrote:

> > To achieve that, check-host-xz.mk fills in the
> > BR2_LZIP_HOST_DEPENDENCY with host-tar if building a host-tar is
> > needed. The name BR2_LZIP_HOST_DEPENDENCY has been chosen because it
> > matches the name BR2_CMAKE_HOST_DEPENDENCY already used in
> > check-host-cmake.mk.
> > 
> > The BR2_LZIP_HOST_DEPENDENCY is added to all packages, except:  
> 
> So even when no package compresed with lzip is enabled?
> 
> That was a gripe of yours, that host-lzip was always built even when not
> needed...

This problem already exists today, and my series does not aim at fixing
it. Fixing it is a separate problem, that I didn't want to solve in the
same series (which as you can see is already growing significantly in
terms of number of patches).

So, it is intentional that I do not solve this specific problem as part
of this series.

Best regards,

Thomas
Yann E. MORIN Dec. 29, 2017, 3:36 p.m. | #3
Thomas, All,

On 2017-12-01 21:53 +0100, Thomas Petazzoni spake thusly:
> 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
> BR2_LZIP_HOST_DEPENDENCY with host-tar if building a host-tar is
> needed. The name BR2_LZIP_HOST_DEPENDENCY has been chosen because it
> matches the name BR2_CMAKE_HOST_DEPENDENCY already used in
> check-host-cmake.mk.
> 
> The BR2_LZIP_HOST_DEPENDENCY is added to all packages, except:
> 
>  - host-lzip, because we would otherwise depend on ourself.
> 
>  - host-tar, because lzip itself is delivered as a tarball, so we need
>    to have host-lzip depend on host-tar, and not host-tar depend on
>    host-lzip
> 
>  - host-skeleton, because we need to have host-lzip depend on
>    host-skeleton, and not the opposite.
> 
> We also mutually exclude host-lzip and host-xz from dependending on
> each other, to avoid a circular dependency.
> 
> In addition, we modify lzip.mk to explicitly build host-lzip without
> ccache. We generally took the approach of building host-ccache *after*
> all the extractors have been built.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Since my comments have been answered:

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
> Changes since v2:
>  - New patch
> ---
>  package/lzip/lzip.mk                    | 2 +-
>  package/pkg-generic.mk                  | 6 +++++-
>  support/dependencies/check-host-lzip.mk | 2 +-
>  3 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk
> index b7ba5dd21d..a16a22214c 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 dfd4719d29..e623afe7bc 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -591,10 +591,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
> -- 
> 2.13.6
>

Patch

diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk
index b7ba5dd21d..a16a22214c 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 dfd4719d29..e623afe7bc 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -591,10 +591,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