From 3de81a46dc0087436c6785d60ba5d25fe4fe3b17 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 19 Jul 2015 15:15:28 +0200 Subject: [PATCH] core/pkg-generic: host variants inherits target's override-srcdir When a package has both a target and a host variants, and there is an override-srcdir set for the target variant, the host variant should inherit the target's override-srcdir, unless explicitly set, like we do for all other target-variant properties. However, do not override it if expressly set to empty (i.e. when the user wants to override only the target variant). Also, as we do for the other variables, the target variant never inherits from the host variant. Reported-by: Mike Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Maxime Hadjinlian Tested-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 75dc8b7e69..6a7d97efdf 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -340,6 +340,10 @@ else endif $(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION)) +ifdef $(3)_OVERRIDE_SRCDIR + $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) +endif + $(2)_BASE_NAME = $(1)-$$($(2)_VERSION) $(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME) $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) -- 2.30.2