From 7b49630ad83d65f3b21802d49d7594db6a217367 Mon Sep 17 00:00:00 2001 From: Adam Heath Date: Mon, 27 Oct 2003 15:44:01 +0000 Subject: [PATCH] Set $reduce_arch when calling parsedep. --- ChangeLog | 4 ++++ debian/changelog | 1 + scripts/dpkg-checkbuilddeps.pl | 8 ++++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3156ba70..c47e294b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Oct 27 09:42:57 CST 2003 Adam Heath + + * scripts/dpkg-checkbuilddeps.pl: Set $reduce_arch when calling parsedep. + Sun Oct 26 19:29:16 CST 2003 Adam Heath * scripts/dpkg-checkbuilddeps.pl: s/dpkg-checkbuild/dpkg-checkbuilddeps/ diff --git a/debian/changelog b/debian/changelog index 2a75d8f9..844c632b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dpkg (1.10.17) unstable; urgency=medium and patch. Closes: Bug#151663 * Branden Robinson : s/dpkg-checkbuild/dpkg-checkbuilddeps/ in usage. + * dpkg-checkbuilddeps now sets $reduce_arch. Closes: #212796. -- Wichert Akkerman UNRELEASED diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl index 905274a8..cbcef5f5 100755 --- a/scripts/dpkg-checkbuilddeps.pl +++ b/scripts/dpkg-checkbuilddeps.pl @@ -41,16 +41,16 @@ local $/=''; my $dep_regex=qr/[ \t]*(([^\n]+|\n[ \t])*)\s/; # allow multi-line if (defined($fi{"C Build-Depends"})) { - push @unmet, build_depends(parsedep($fi{"C Build-Depends"}, 1), @status); + push @unmet, build_depends(parsedep($fi{"C Build-Depends"}, 1, 1), @status); } if (defined($fi{"C Build-Conflicts"})) { - push @unmet, build_conflicts(parsedep($fi{"C Build-Conflicts"}, 1), @status); + push @unmet, build_conflicts(parsedep($fi{"C Build-Conflicts"}, 1, 1), @status); } if (! $binary_only && defined($fi{"C Build-Depends-Indep"})) { - push @unmet, build_depends(parsedep($fi{"C Build-Depends-Indep"}, 1), @status); + push @unmet, build_depends(parsedep($fi{"C Build-Depends-Indep"}, 1, 1), @status); } if (! $binary_only && defined($fi{"C Build-Conflicts-Indep"})) { - push @unmet, build_conflicts(parsedep($fi{"C Build-Conflicts-Indep"}, 1), @status); + push @unmet, build_conflicts(parsedep($fi{"C Build-Conflicts-Indep"}, 1, 1), @status); } if (@unmet) { -- 2.39.5