From e4ed3288e99880f528b96ae2ec192ba91f22f70a Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 28 Mar 2012 16:28:25 -0500 Subject: Add build dependency for qtwayland + make qtwayland non default module Running ./build qtwayland will build qtwayland and its dependencies. Change-Id: I78f0b0cec6bc21a14f0d8d89e42080589d9b28b6 Reviewed-by: Thiago Macieira --- build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'build') diff --git a/build b/build index 8570010a..7e29c77b 100755 --- a/build +++ b/build @@ -132,7 +132,7 @@ sub new my $depfile = "build.dependencies"; my $result; - our (%build_dependencies, %build_commands, %install_commands); + our (%build_dependencies, %build_commands, %install_commands, @nondefault_modules); # following variables may be expanded in the evaluation below my $MAKEOPTS = $self->{'MAKEOPTS'}; @@ -146,6 +146,7 @@ sub new $self->{'deps'} = \%build_dependencies; $self->{'buildcmds'} = \%build_commands; $self->{'instcmds'} = \%install_commands; + $self->{'nondefault'} = \@nondefault_modules; return $self; } @@ -423,7 +424,12 @@ sub run if (scalar @{$self->{'build-submodules'}} > 0) { $self->check_build_modules(1); } else { - push(@{$self->{'build-submodules'}}, keys(%{$self->{'deps'}})); + my @default = keys(%{$self->{'deps'}}); + my @nondefault = @{$self->{'nondefault'}}; + foreach my $item (@nondefault) { + @default = grep { $_ ne $item } @default; + } + push(@{$self->{'build-submodules'}}, @default); $self->check_build_modules(0); } -- cgit v1.2.3