[debhelper-devel] [debhelper] 05/05: dh_gencontrol: HACK; work around dpkg for now

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch dh-cross-target
in repository debhelper.

commit 836f961ac17b6a2c74166e7a4f75538e1a6d31c8
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Oct 21 14:10:21 2017 +0000

    dh_gencontrol: HACK; work around dpkg for now
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_gencontrol | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dh_gencontrol b/dh_gencontrol
index 271aa9a..4691c2f 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -102,11 +102,16 @@ on_pkgs_in_parallel {
 		# avoid gratuitous warnings
 		ensure_substvars_are_present($substvars, 'misc:Depends', 'misc:Pre-Depends');
 
-		my (@debug_info_params, $build_ids, @multiarch_params);
+		my (@debug_info_params, $build_ids, @multiarch_params, @arch_reset);
 		if ( -d $dbgsym_info_dir ) {
 			$build_ids = read_dbgsym_build_ids($dbgsym_info_dir);
 		}
 
+		if (Debian::Debhelper::Dh_Lib::package_cross_type($package) eq 'target') {
+			my $target_arch = dpkg_architecture_value('DEB_TARGET_ARCH');
+			push(@arch_reset, 'dpkg-architecture', '--host-arch', $target_arch, '-f', '-c');
+		}
+
 		if ( -d $dbgsym_tmp) {
 			my $multiarch = package_multiarch($package);
 			my $section = package_section($package);
@@ -147,8 +152,8 @@ on_pkgs_in_parallel {
 				push(@dbgsym_options, '-UReplaces', '-UBreaks');
 			}
 			install_dir("${dbgsym_tmp}/DEBIAN");
-			doit("dpkg-gencontrol", "-p${package}", "-l$changelog", "-T$substvars",
-				"-P${dbgsym_tmp}",@{$dh{U_PARAMS}}, @dbgsym_options);
+			doit(@arch_reset, "dpkg-gencontrol", "-p${package}", "-l$changelog", "-T$substvars",
+				"-P${dbgsym_tmp}", @{$dh{U_PARAMS}}, @dbgsym_options);
 
 			reset_perm_and_owner(0644, "${dbgsym_tmp}/DEBIAN/control");
 		} elsif ($build_ids) {
@@ -163,7 +168,7 @@ on_pkgs_in_parallel {
 			if (package_multiarch($package) eq 'no');
 
 		# Generate and install control file.
-		doit("dpkg-gencontrol", "-p$package", "-l$changelog", "-T$substvars",
+		doit(@arch_reset, "dpkg-gencontrol", "-p$package", "-l$changelog", "-T$substvars",
 			"-P$tmp", @debug_info_params, @multiarch_params,
 			@{$dh{U_PARAMS}});
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git