Merge commit 'origin/buildsystems' into python-build

[debhelper.git] / Debian / Debhelper / Buildsystem / python_distutils.pm

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index cca000d6f5f616881a4d390ffe7e151f1154f6f6..e1b1aef0ac94842622d6455e9596572c66635106 100644 (file)
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -61,12 +61,12 @@ sub pre_building_step {
 
        return unless grep /$step/, qw(build install clean);
 
-       # --build-base can only be passed to the build command. However,
-       # it is always read from the config file (really weird design).
-       # Therefore create such a cfg config file.
-       # See http://bugs.python.org/issue818201
-       #     http://bugs.python.org/issue1011113
        if ($this->get_buildpath() ne $this->DEFAULT_BUILD_DIRECTORY()) {
+               # --build-base can only be passed to the build command. However,
+               # it is always read from the config file (really weird design).
+               # Therefore create such a cfg config file.
+               # See http://bugs.python.org/issue818201
+               #     http://bugs.python.org/issue1011113
                not $this->not_our_cfg() or
                    error("cannot set custom build directory: .pydistutils.cfg is in use");
                $this->mkdir_builddir();
@@ -79,10 +79,66 @@ sub pre_building_step {
        $this->SUPER::pre_building_step($step);
 }
 
+sub dbg_build_needed {
+       my $this=shift;
+       my $act=shift;
+
+       # Return a list of python-dbg package which are listed
+       # in the build-dependencies. This is kinda ugly, but building
+       # dbg extensions without checking if they're supposed to be
+       # built may result in various FTBFS if the package is not
+       # built in a clean chroot.
+
+       my @dbg;
+       open (CONTROL, 'debian/control') ||
+               error("cannot read debian/control: $!\n");
+       foreach my $builddeps (join('', <CONTROL>) =~ 
+                       /^Build-Depends[^:]*:.*\n(?:^[^\w\n].*\n)*/gmi) {
+               while ($builddeps =~ /(python[^, ]*-dbg)/g) {
+                       push @dbg, $1;
+               }
+       }
+
+       close CONTROL;
+       return @dbg;
+
+}
+
 sub setup_py {
        my $this=shift;
        my $act=shift;
-       $this->doit_in_sourcedir("python", "setup.py", $act, @_);
+
+       # We need to to run setup.py with the default python first
+       # as distutils/setuptools modifies the shebang lines of scripts.
+       # This ensures that #!/usr/bin/python is used and not pythonX.Y
+       # Take into account that the default Python must not be in
+       # the requested Python versions.
+       # Then, run setup.py with each available python, to build
+        # extensions for each.
+
+        my $python_default = `pyversions -d`;
+        $python_default =~ s/^\s+//;
+        $python_default =~ s/\s+$//;
+        my @python_requested = split ' ', `pyversions -r 2>/dev/null`;
+       if (grep /^\Q$python_default\E/, @python_requested) {
+               @python_requested = ("python", grep(!/^\Q$python_default\E/,
+                                       @python_requested));
+       }
+        my @dbg_build_needed = $this->dbg_build_needed();
+
+       foreach my $python (@python_requested) {
+               if (-x "/usr/bin/".$python) {
+                       $this->doit_in_sourcedir($python, "setup.py", $act, @_);
+               }
+               $python = $python . "-dbg";
+               if (grep /^(python-all-dbg|\Q$python\E)/, @dbg_build_needed) {
+                       $this->doit_in_sourcedir($python, "setup.py", $act, @_);
+               } elsif (($python eq "python-dbg")
+                       and (grep /^$python_default/, @dbg_build_needed)) {
+                       $this->doit_in_sourcedir($python_default."-dbg",
+                               "setup.py", $act, @_);
+               }
+       }
 }
 
 sub build {