cmake: Pass CPPFLAGS in CFLAGS. Closes: #668813 Thanks, Simon Ruderich for the patch...

[debhelper.git] / Debian / Debhelper / Dh_Buildsystems.pm

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 8470eac05171f7d4e767f2703db6f202110fab1c..0a51a4d228ea6fa81cf5df75d8640d8e82f358a1 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -20,12 +20,15 @@ use constant BUILD_STEPS => qw(configure build test install clean);
 # build systems MUST be added to the END of the list.
 our @BUILDSYSTEMS = (
        "autoconf",
+       (! compat(7) ? "perl_build" : ()),
        "perl_makemaker",
        "makefile",
        "python_distutils",
-       "perl_build",
+       (compat(7) ? "perl_build" : ()),
        "cmake",
        "ant",
+       "qmake",
+       "qmake_qt4",
 );
 
 my $opt_buildsys;
@@ -62,7 +65,7 @@ sub autoselect_buildsystem {
        my $selected;
        my $selected_level = 0;
 
-       for my $inst (@_) {
+       foreach my $inst (@_) {
                # Only derived (i.e. more specific) build system can be
                # considered beyond the currently selected one.
                next if defined $selected && !$inst->isa(ref $selected);
@@ -92,7 +95,7 @@ sub load_buildsystem {
        else {
                # Try to determine build system automatically
                my @buildsystems;
-               for $system (@BUILDSYSTEMS) {
+               foreach $system (@BUILDSYSTEMS) {
                        push @buildsystems, create_buildsystem_instance($system, @_);
                }
                return autoselect_buildsystem($step, @buildsystems);
@@ -103,10 +106,10 @@ sub load_all_buildsystems {
        my $incs=shift || \@INC;
        my (%buildsystems, @buildsystems);
 
-       for my $inc (@$incs) {
+       foreach my $inc (@$incs) {
                my $path = File::Spec->catdir($inc, "Debian/Debhelper/Buildsystem");
                if (-d $path) {
-                       for my $module_path (glob "$path/*.pm") {
+                       foreach my $module_path (glob "$path/*.pm") {
                                my $name = basename($module_path);
                                $name =~ s/\.pm$//;
                                next if exists $buildsystems{$name};
@@ -116,7 +119,7 @@ sub load_all_buildsystems {
        }
 
        # Standard debhelper build systems first
-       for my $name (@BUILDSYSTEMS) {
+       foreach my $name (@BUILDSYSTEMS) {
                error("standard debhelper build system '$name' could not be found/loaded")
                    if not exists $buildsystems{$name};
                push @buildsystems, $buildsystems{$name};
@@ -124,7 +127,7 @@ sub load_all_buildsystems {
        }
 
        # The rest are 3rd party build systems
-       for my $name (keys %buildsystems) {
+       foreach my $name (keys %buildsystems) {
                my $inst = $buildsystems{$name};
                $inst->{thirdparty} = 1;
                push @buildsystems, $inst;
@@ -135,14 +138,14 @@ sub load_all_buildsystems {
 
 sub buildsystems_init {
        my %args=@_;
-       
-       my $max_parallel=-1; # unlimited
+
+       my $max_parallel=1;
 
        # Available command line options
        my %options = (
            "D=s" => \$opt_sourcedir,
            "sourcedirectory=s" => \$opt_sourcedir,
-       
+
            "B:s" => \$opt_builddir,
            "builddirectory:s" => \$opt_builddir,
 
@@ -152,31 +155,24 @@ sub buildsystems_init {
            "l" => \$opt_list,
            "list" => \$opt_list,
 
+           "parallel" => sub { $max_parallel = -1 },
            "max-parallel=i" => \$max_parallel,
        );
        $args{options}{$_} = $options{$_} foreach keys(%options);
        Debian::Debhelper::Dh_Lib::init(%args);
+       Debian::Debhelper::Dh_Lib::set_buildflags();
        set_parallel($max_parallel);
 }
 
 sub set_parallel {
        my $max=shift;
 
-       $opt_parallel=1;
-
-       if (exists $ENV{DEB_BUILD_OPTIONS}) {
-               # Parse parallel=n tag
-               foreach my $opt (split(/\s+/, $ENV{DEB_BUILD_OPTIONS})) {
-                       if ($opt =~ /^parallel=([-\d]+)$/) {
-                               my $n=$1;
-                               if ($n > 0 && ($max == -1 || $n < $max)) {
-                                       $opt_parallel = $n;
-                               }
-                               else {
-                                       $opt_parallel = $max;
-                               }
-                       }
-               }
+       # Get number of processes from parallel=n option, limiting it
+       # with $max if needed
+       $opt_parallel=get_buildoption("parallel") || 1;
+
+       if ($max > 0 && $opt_parallel > $max) {
+               $opt_parallel = $max;
        }
 }
 
@@ -188,7 +184,7 @@ sub buildsystems_list {
        my $specified;
 
        # List build systems (including auto and specified status)
-       for my $inst (@buildsystems) {
+       foreach my $inst (@buildsystems) {
                if (! defined $specified && defined $opt_buildsys && $opt_buildsys eq $inst->NAME()) {
                        $specified = $inst;
                }