[debhelper-devel] [Git][debian/debhelper][master] Buildsystem: Pass more methods to target buildsystems

[Niels Thykier]

Niels Thykier pushed to branch master at Debian / debhelper


Commits:
230da7c8 by Niels Thykier at 2018-04-08T08:21:40+00:00
Buildsystem: Pass more methods to target buildsystems

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


2 changed files:

- debian/changelog
- lib/Debian/Debhelper/Buildsystem.pm


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (11.2.1) UNRELEASED; urgency=medium
+
+  * Buildsystem.pm: Correctly pass build directory values to
+    target buildsystems.  Thanks to Helmut Grohne, Adrian Bunk
+    and Tobias Frost for the reports and debugging.
+    (Closes: #895174, #895181)
+
+ -- Niels Thykier <niels at thykier.net>  Sun, 08 Apr 2018 07:13:22 +0000
+
 debhelper (11.2) unstable; urgency=medium
 
   [ Niels Thykier ]


=====================================
lib/Debian/Debhelper/Buildsystem.pm
=====================================
--- a/lib/Debian/Debhelper/Buildsystem.pm
+++ b/lib/Debian/Debhelper/Buildsystem.pm
@@ -165,6 +165,11 @@ sub _set_builddir {
 		}
 	}
 	$this->{builddir} = $builddir;
+	# Use get as guard because this method is (also) called from the
+	# constructor before the target build system is setup.
+	if ($this->get_targetbuildsystem) {
+		$this->get_targetbuildsystem->{builddir} = $builddir;
+	};
 	return $builddir;
 }
 
@@ -229,6 +234,11 @@ sub enforce_in_source_building {
 		$this->{warn_insource} = 1;
 		$this->{builddir} = undef;
 	}
+	if ($this->IS_GENERATOR_BUILD_SYSTEM) {
+		$this->get_targetbuildsystem->enforce_in_source_building(@_);
+		# Only warn in once build system.
+		delete($this->{warn_insource});
+	}
 }
 
 # Derived class can call this method in its constructor to *prefer*
@@ -247,6 +257,9 @@ sub prefer_out_of_source_building {
 			error("default build directory is the same as the source directory." .
 			      " Please specify a custom build directory");
 		}
+		if ($this->IS_GENERATOR_BUILD_SYSTEM) {
+			$this->get_targetbuildsystem->prefer_out_of_source_building(@_);
+		}
 	}
 }
 
@@ -355,6 +368,9 @@ sub get_parallel {
 sub disable_parallel {
 	my ($this) = @_;
 	$this->{parallel} = 1;
+	if ($this->IS_GENERATOR_BUILD_SYSTEM) {
+		$this->get_targetbuildsystem->disable_parallel;
+	}
 }
 
 # When given a relative path to the build directory, converts it



View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/230da7c887bb6ad8827445f86d4f3bbc3a5ee83d

---
View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/230da7c887bb6ad8827445f86d4f3bbc3a5ee83d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debhelper-devel/attachments/20180408/25d051d9/attachment-0001.html>