[gentoo-commits] gentoo-x86 commit in app-arch/dpkg/files: dpkg-1.16.1-bootstrap.patch

[gentoo-commits] gentoo-x86 commit in app-arch/dpkg/files: dpkg-1.16.1-bootstrap.patch

[Jeroen Roovers (jer)]

jer         11/10/18 21:58:13

  Added:                dpkg-1.16.1-bootstrap.patch
  Log:
  Add rewritten bootstrap patch (bug #386949).
  
  (Portage version: 2.2.0_alpha69/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-arch/dpkg/files/dpkg-1.16.1-bootstrap.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/dpkg/files/dpkg-1.16.1-bootstrap.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/dpkg/files/dpkg-1.16.1-bootstrap.patch?rev=1.1&content-type=text/plain

Index: dpkg-1.16.1-bootstrap.patch
===================================================================
--- a/m4/dpkg-arch.m4	2011-10-12 07:56:03.000000000 +0200
+++ b/m4/dpkg-arch.m4	2011-10-18 23:36:24.311829478 +0200
@@ -9,7 +9,7 @@
 AC_REQUIRE([DPKG_PROG_PERL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 $2=$(cd $srcdir/scripts; \
-    PERL5LIB=$(pwd) $PERL dpkg-architecture.pl -t$host -q$1 2>/dev/null)
+    pkgdatadir=.. PERL5LIB=$(pwd) $PERL dpkg-architecture.pl -t$host -q$1 2>/dev/null)
 ])# _DPKG_ARCHITECURE
 
 # DPKG_CPU_TYPE
--- a/scripts/Dpkg/Arch.pm	2011-10-14 06:58:09.000000000 +0200
+++ b/scripts/Dpkg/Arch.pm	2011-10-18 23:38:13.714474150 +0200
@@ -50,8 +50,7 @@
 	return $build_arch if defined $build_arch;
 
 	my $build_arch = `dpkg --print-architecture`;
-	# FIXME: Handle bootstrapping
-	syserr("dpkg --print-architecture failed") if $? >> 8;
+	if ($? >> 8) { $build_arch = get_raw_host_arch(); }
 
 	chomp $build_arch;
 	return $build_arch;