Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 218499 Details for
Bug 289094
app-arch/dpkg bootstrap problem breaks dpkg-architecture
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Do the previous thing and also FIX the FIXME in Arch.pm
dpkg-1.15.5.6-bootstrap.patch (text/plain), 1.14 KB, created by
Jeroen Roovers (RETIRED)
on 2010-02-05 08:00:07 UTC
(
hide
)
Description:
Do the previous thing and also FIX the FIXME in Arch.pm
Filename:
MIME Type:
Creator:
Jeroen Roovers (RETIRED)
Created:
2010-02-05 08:00:07 UTC
Size:
1.14 KB
patch
obsolete
>diff -Nur dpkg-1.15.5.6.org/m4/dpkg-arch.m4 dpkg-1.15.5.6/m4/dpkg-arch.m4 >--- dpkg-1.15.5.6.org/m4/dpkg-arch.m4 2010-01-08 18:23:06.000000000 +0100 >+++ dpkg-1.15.5.6/m4/dpkg-arch.m4 2010-02-05 08:13:09.000000000 +0100 >@@ -5,7 +5,7 @@ > AC_DEFUN([_DPKG_ARCHITECTURE], [ > AC_REQUIRE([AC_CANONICAL_HOST])dnl > $2=$(cd $srcdir/scripts; \ >- PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$host -q$1 2>/dev/null) >+ pkgdatadir=.. PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$host -q$1 2>/dev/null) > ])# _DPKG_ARCHITECURE > > # DPKG_CPU_TYPE >diff -Nur dpkg-1.15.5.6.org/scripts/Dpkg/Arch.pm dpkg-1.15.5.6/scripts/Dpkg/Arch.pm >--- dpkg-1.15.5.6.org/scripts/Dpkg/Arch.pm 2010-01-08 09:00:34.000000000 +0100 >+++ dpkg-1.15.5.6/scripts/Dpkg/Arch.pm 2010-02-05 08:49:42.000000000 +0100 >@@ -47,8 +47,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; >Files dpkg-1.15.5.6.org/scripts/Dpkg/.Arch.pm.swp and dpkg-1.15.5.6/scripts/Dpkg/.Arch.pm.swp differ
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 289094
:
218489
| 218499