X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debian%2FDebhelper%2FBuildsystem%2Fpython_distutils.pm;h=81cff3c9fc8fe15689605f800964f585a0725dbd;hb=00250d8cd20a37be362850d3ed8a652b0768455f;hp=39a4466ad58c8ce034c5038b9ad473a7234a01db;hpb=13e1de542d940506fdad6f14620131310bd8ec11;p=debhelper.git

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 39a4466..81cff3c 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -18,20 +18,20 @@ sub DESCRIPTION {
 
 sub DEFAULT_BUILD_DIRECTORY {
 	my $this=shift;
-	return $this->_canonpath($this->get_sourcepath("build"));
+	return $this->canonpath($this->get_sourcepath("build"));
 }
 
 sub new {
 	my $class=shift;
 	my $this=$class->SUPER::new(@_);
-	# Out of source tree building is prefered.
-	$this->enforce_out_of_source_building(@_);
+	# Out of source tree building is preferred.
+	$this->prefer_out_of_source_building(@_);
 	return $this;
 }
 
 sub check_auto_buildable {
 	my $this=shift;
-	return -e $this->get_sourcepath("setup.py");
+	return -e $this->get_sourcepath("setup.py") ? 1 : 0;
 }
 
 sub not_our_cfg {
@@ -61,10 +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.
 	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();
@@ -73,27 +75,121 @@ sub pre_building_step {
 		# Distutils reads $HOME/.pydistutils.cfg
 		$ENV{HOME} = Cwd::abs_path($this->get_buildpath());
 	}
+
+	$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 last
+	# as distutils/setuptools modifies the shebang lines of scripts.
+	# This ensures that #!/usr/bin/python is installed last 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`;
+	if ($? == -1) {
+		error("failed to run pyversions")
+	}
+	my $ecode = $? >> 8;
+	if ($ecode != 0) {
+		error("pyversions -d failed [$ecode]")
+	}
+	$python_default =~ s/^\s+//;
+	$python_default =~ s/\s+$//;
+	my @python_requested = split ' ', `pyversions -r`;
+	if ($? == -1) {
+		error("failed to run pyversions")
+	}
+	$ecode = $? >> 8;
+	if ($ecode != 0) {
+		error("pyversions -r failed [$ecode]")
+	}
+	if (grep /^\Q$python_default\E/, @python_requested) {
+		@python_requested = (
+			grep(!/^\Q$python_default\E/, @python_requested),
+			"python",
+		);
+	}
+
+	my @python_dbg;
+	my @dbg_build_needed = $this->dbg_build_needed();
+	foreach my $python (map { $_."-dbg" } @python_requested) {
+		if (grep /^(python-all-dbg|\Q$python\E)/, @dbg_build_needed) {
+			push @python_dbg, $python;
+		}
+		elsif (($python eq "python-dbg")
+		       and (grep /^\Q$python_default\E/, @dbg_build_needed)) {
+			push @python_dbg, $python_default."-dbg";
+		}
+	}
+
+	foreach my $python (@python_dbg, @python_requested) {
+		if (-f "/usr/lib/$python/distutils/__init__.py") {
+			# To allow backports of debhelper we don't pass
+			# --install-layout=deb to 'setup.py install` for
+			# those Python versions where the option is
+			# ignored by distutils/setuptools.
+			if ( $act eq "install" and not
+			     ( ($python =~ /^python(?:-dbg)?$/
+			         and $python_default =~ /^python2\.[2345]$/)
+			      or $python =~ /^python2\.[2345](?:-dbg)?$/ )) {
+				$this->doit_in_sourcedir($python, "setup.py",
+						$act, @_, "--install-layout=deb");
+			}
+			else {
+				$this->doit_in_sourcedir($python, "setup.py",
+						$act, @_);
+			}
+		}
+	}
 }
 
 sub build {
 	my $this=shift;
-	$this->setup_py("build", @_);
+	$this->setup_py("build",
+		"--force",
+		@_);
 }
 
 sub install {
 	my $this=shift;
 	my $destdir=shift;
 	$this->setup_py("install",
+		"--force",
 		"--root=$destdir",
 		"--no-compile",
 		"-O0",
-		"--install-layout=deb",
 		@_);
 }
 
@@ -111,4 +207,4 @@ sub clean {
 	$this->doit_in_sourcedir('find', '.', '-name', '*.pyc', '-exec', 'rm', '{}', ';');
 }
 
-1;
+1