diff options
| -rw-r--r-- | Debian/Debhelper/Dh_Buildsystems.pm | 11 | ||||
| -rwxr-xr-x | t/buildsystems/buildsystem_tests.t | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm index 075d34dc..a2424c73 100644 --- a/Debian/Debhelper/Dh_Buildsystems.pm +++ b/Debian/Debhelper/Dh_Buildsystems.pm @@ -93,6 +93,11 @@ sub autoselect_buildsystem { sub load_buildsystem { my $system=shift; my $step=shift; + my $system_options; + if (defined($system) && ref($system) eq 'HASH') { + $system_options = $system; + $system = $system_options->{'system'}; + } if (defined $system) { my $inst = create_buildsystem_instance($system, 1, @_); return $inst; @@ -103,8 +108,10 @@ sub load_buildsystem { foreach $system (@BUILDSYSTEMS) { push @buildsystems, create_buildsystem_instance($system, 1, @_); } - foreach $system (@THIRD_PARTY_BUILDSYSTEMS) { - push @buildsystems, create_buildsystem_instance($system, 0, @_); + if (!$system_options || $system_options->{'enable-thirdparty'}) { + foreach $system (@THIRD_PARTY_BUILDSYSTEMS) { + push @buildsystems, create_buildsystem_instance($system, 0, @_); + } } return autoselect_buildsystem($step, @buildsystems); } diff --git a/t/buildsystems/buildsystem_tests.t b/t/buildsystems/buildsystem_tests.t index b6e2c91b..5a0f57ca 100755 --- a/t/buildsystems/buildsystem_tests.t +++ b/t/buildsystems/buildsystem_tests.t @@ -295,7 +295,7 @@ sub test_autoselection { my $expected=shift; my %args=@_; for my $step (@STEPS) { - my $bs = load_buildsystem(undef, $step, @_); + my $bs = load_buildsystem({'enable-thirdparty' => 0}, $step, @_); my $e = $expected; $e = $expected->{$step} if ref $expected; if (defined $bs) { |