From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 20 Sep 2010 20:17:28 +0000 (+0000)
Subject: fix build dependencies on packages with multiple variants but no selected virtual... 
X-Git-Tag: reboot~18870
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7f80e266612c4ce1f17c7cbdfc268057de9ae58b;p=openwrt%2Fstaging%2Fchunkeey.git

fix build dependencies on packages with multiple variants but no selected virtual packages

SVN-Revision: 23102
---

diff --git a/include/subdir.mk b/include/subdir.mk
index afc95a4427..19a1fb63a9 100644
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -35,7 +35,7 @@ define subdir
       )
       $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd))))
 	  	$(if $(BUILD_LOG),@mkdir -p $(BUILD_LOG_DIR)/$(1)/$(bd))
-        $(foreach variant,$(if $(BUILD_VARIANT),$(BUILD_VARIANT),$(if $($(1)/$(bd)/variants),$($(1)/$(bd)/variants),__default)),
+        $(foreach variant,$(if $(BUILD_VARIANT),$(BUILD_VARIANT),$(if $(strip $($(1)/$(bd)/variants)),$($(1)/$(bd)/variants),$(if $($(1)/$(bd)/default-variant),$($(1)/$(bd)/default-variant),__default))),
 			+$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) BUILD_VARIANT="$(filter-out __default,$(variant))" $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE,   ERROR: $(1)/$(bd) failed to build$(if $(filter-out __default,$(variant)), (build variant: $(variant))).))
         )
         $$(if $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target))
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 2e90257270..45d202e439 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -640,6 +640,9 @@ sub gen_package_mk() {
 			$pkg->{buildonly} and $config = "";
 			print "package-$config += $pkg->{subdir}$pkg->{src}\n";
 			if ($pkg->{variant}) {
+				if (!defined($done{$pkg->{src}})) {
+					print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n";
+				}
 				print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n"
 			}
 			$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";