[debhelper-devel] [Git][debian/debhelper][master] Dh_Lib: make pkgfile rely on package_cross_type

[Niels Thykier]

Niels Thykier pushed to branch master at Debian / debhelper


Commits:
bd9fe946 by Niels Thykier at 2018-02-18T08:36:31+00:00
Dh_Lib: make pkgfile rely on package_cross_type

During a cross-compilation, if a package is set to compile for TARGET,
then we should use the TARGET specific pkgfile rather than the HOST
specific one (if any).

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

- - - - -


2 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ debhelper (11.1.5) UNRELEASED; urgency=medium
     dbgsym building via DEB_BUILD_OPTIONS).  This regression
     was introduced in 11.1.  Thanks to Christian Marillat for
     reporting the bug.  (Closes: #890736)
+  * Dh_Lib: pkgfile() now properly uses for DEB_TARGET_ARCH{,_OS}
+    when the package is set to be built for the target
+    architecture.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 04 Feb 2018 18:03:34 +0000
 


=====================================
lib/Debian/Debhelper/Dh_Lib.pm
=====================================
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -806,9 +806,10 @@ sub default_sourcedir {
 			for my $pkg (@{$package}) {
 				push(@try, "debian/${pkg}.${filename}");
 				if ($check_expensive) {
+					my $cross_type = uc(package_cross_type($package));
 					push(@try,
-						 "debian/${pkg}.${filename}.".hostarch(),
-						 "debian/${pkg}.${filename}.".dpkg_architecture_value("DEB_HOST_ARCH_OS"),
+						 "debian/${pkg}.${filename}.".dpkg_architecture_value("DEB_${cross_type}_ARCH"),
+						 "debian/${pkg}.${filename}.".dpkg_architecture_value("DEB_${cross_type}_ARCH_OS"),
 					);
 				}
 			}
@@ -816,9 +817,10 @@ sub default_sourcedir {
 			# Avoid checking for hostarch+hostos unless we have reason
 			# to believe that they exist.
 			if ($check_expensive) {
+				my $cross_type = uc(package_cross_type($package));
 				push(@try,
-					 "debian/${package}.${filename}.".hostarch(),
-					 "debian/${package}.${filename}.".dpkg_architecture_value("DEB_HOST_ARCH_OS"),
+					 "debian/${package}.${filename}.".dpkg_architecture_value("DEB_${cross_type}_ARCH"),
+					 "debian/${package}.${filename}.".dpkg_architecture_value("DEB_${cross_type}_ARCH_OS"),
 					);
 			}
 			push(@try, "debian/$package.$filename");



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

---
View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/bd9fe9460f9fd3dc6bc4a66b66da6e67eb6d5413
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/20180218/d42d4ce1/attachment-0001.html>