Changeset 23102


Ignore:
Timestamp:
2010-09-20T22:17:28+02:00 (6 years ago)
Author:
nbd
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/subdir.mk

    r22871 r23102  
    3636      $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd)))) 
    3737                $(if $(BUILD_LOG),@mkdir -p $(BUILD_LOG_DIR)/$(1)/$(bd)) 
    38         $(foreach variant,$(if $(BUILD_VARIANT),$(BUILD_VARIANT),$(if $($(1)/$(bd)/variants),$($(1)/$(bd)/variants),__default)), 
     38        $(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))), 
    3939                        +$(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))).)) 
    4040        ) 
  • trunk/scripts/metadata.pl

    r23029 r23102  
    641641                        print "package-$config += $pkg->{subdir}$pkg->{src}\n"; 
    642642                        if ($pkg->{variant}) { 
     643                                if (!defined($done{$pkg->{src}})) { 
     644                                        print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n"; 
     645                                } 
    643646                                print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n" 
    644647                        } 
Note: See TracChangeset for help on using the changeset viewer.