Преглед на файлове

Call dpkg-architecture instead dpkg to determine the host architecture.
Rename BUILD_ARCH to HOST_ARCH.

Wichert Akkerman преди 25 години
родител
ревизия
593d367a85
променени са 3 файла, в които са добавени 10 реда и са изтрити 4 реда
  1. 5 0
      ChangeLog
  2. 1 0
      debian/changelog
  3. 4 4
      scripts/dpkg-checkbuilddeps.pl

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Mon May 21 03:48:29 CEST 2001 Marcus Brinkmann <brinkmd@debian.org>
+
+  * scripts/dpkg-checkbuilddeps.pl: Call dpkg-architecture instead dpkg
+    to determine the host architecture.  Rename BUILD_ARCH to HOST_ARCH.
+
 Fri Jul  6 00:27:17 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
  * scripts/dpkg-divert.8: Fix layout error in synopsis

+ 1 - 0
debian/changelog

@@ -6,6 +6,7 @@ dpkg (1.10) unstable; urgency=low
   * Fix layout problem in dpkg-divert manpage. Closes: Bug#103667
   * When a package is set to hold, and a reinstallation is requested,
     -E will not properly skip it.  Closes: #45787.
+  * Make dpkg-checkbuilddeps use dpkg-architecture. Closes: Bug#104230
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

+ 4 - 4
scripts/dpkg-checkbuilddeps.pl

@@ -120,8 +120,8 @@ sub check_line {
 	my $line=shift;
 	my %version=%{shift()};
 	my %providers=%{shift()};
-	my $build_arch=shift || `dpkg --print-architecture`;
-	chomp $build_arch;
+	my $host_arch=shift || `dpkg-architecture -qDEB_HOST_ARCH`;
+	chomp $host_arch;
 
 	my @unmet=();
 	foreach my $dep (split(/,\s*/, $line)) {
@@ -136,11 +136,11 @@ ALTERNATE:	foreach my $alternate (split(/\s*\|\s*/, $dep)) {
 				my $arches=lc($1);
 				my $seen_arch='';
 				foreach my $arch (split(' ', $arches)) {
-					if ($arch eq $build_arch) {
+					if ($arch eq $host_arch) {
 						$seen_arch=1;
 						next;
 					}
-					elsif ($arch eq "!$build_arch") {
+					elsif ($arch eq "!$host_arch") {
 						next ALTERNATE;
 					}
 					elsif ($arch =~ /!/) {