From 346e926c1506ec8bc99ce3dd653d01ebb605fc70 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Sun, 25 Jun 2017 22:56:08 +0200 Subject: [PATCH] pkg-virtual: fix host dependencies handling If $(BR2_PACKAGE_HAS_HOST_FOO) is defined, then the pkg-virtual infrastructure will check if $(BR2_PACKAGE_PROVIDES_HOST_FOO) is not empty. But later, $(BR2_PACKAGE_HOST_FOO_DEPENDENCIES) will be set from $(BR2_PACKAGE_PROVIDES_FOO), ignoring $(BR2_PACKAGE_PROVIDES_HOST_FOO). So fix this discrepancy by setting $(BR2_PACKAGE_HOST_FOO_DEPENDENCIES) from $(BR2_PACKAGE_PROVIDES_FOO) only if $(BR2_PACKAGE_PROVIDES_HOST_FOO) is empty. Signed-off-by: Eric Le Bihan Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: add comments suggested by Arnout.] Signed-off-by: Thomas Petazzoni --- package/pkg-virtual.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/pkg-virtual.mk b/package/pkg-virtual.mk index 2e83e077e0..0de79d49be 100644 --- a/package/pkg-virtual.mk +++ b/package/pkg-virtual.mk @@ -49,7 +49,13 @@ $(2)_IS_VIRTUAL = YES ifeq ($(4),target) $(2)_DEPENDENCIES += $$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2))) else +ifeq ($$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2))),) +# Inherit from target package BR2_PACKAGE_PROVIDES_FOO $(2)_DEPENDENCIES += host-$$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(3))) +else +# BR2_PACKAGE_PROVIDES_HOST_ is explicitly defined +$(2)_DEPENDENCIES += $$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2))) +endif endif # Call the generic package infrastructure to generate the necessary -- 2.30.2