diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-10-18 21:58:13 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-10-18 21:58:13 +0000 |
| commit | e443a8caa469195351ec7f137fe4931fdb6c98c1 (patch) | |
| tree | ac706658c7d776c7f9426745ba8bdd64f9baac2c /app-arch | |
| parent | Drop old, bug 387545 (diff) | |
| download | gentoo-2-e443a8caa469195351ec7f137fe4931fdb6c98c1.tar.gz gentoo-2-e443a8caa469195351ec7f137fe4931fdb6c98c1.tar.bz2 gentoo-2-e443a8caa469195351ec7f137fe4931fdb6c98c1.zip | |
Add rewritten bootstrap patch (bug #386949).
(Portage version: 2.2.0_alpha69/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/dpkg/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/dpkg/dpkg-1.16.1.1.ebuild | 3 | ||||
| -rw-r--r-- | app-arch/dpkg/dpkg-1.16.1.ebuild | 3 | ||||
| -rw-r--r-- | app-arch/dpkg/files/dpkg-1.16.1-bootstrap.patch | 23 |
4 files changed, 32 insertions, 3 deletions
diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog index 75333b95b86a..1ff7cc7df231 100644 --- a/app-arch/dpkg/ChangeLog +++ b/app-arch/dpkg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/dpkg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.175 2011/10/18 21:23:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.176 2011/10/18 21:58:13 jer Exp $ + + 18 Oct 2011; Jeroen Roovers <jer@gentoo.org> dpkg-1.16.1.ebuild, + dpkg-1.16.1.1.ebuild, +files/dpkg-1.16.1-bootstrap.patch: + Add rewritten bootstrap patch (bug #386949). 18 Oct 2011; Jeroen Roovers <jer@gentoo.org> dpkg-1.16.0.3.ebuild, dpkg-1.16.1.ebuild, dpkg-1.16.1.1.ebuild: diff --git a/app-arch/dpkg/dpkg-1.16.1.1.ebuild b/app-arch/dpkg/dpkg-1.16.1.1.ebuild index 5faf224995c2..ec38d074f431 100644 --- a/app-arch/dpkg/dpkg-1.16.1.1.ebuild +++ b/app-arch/dpkg/dpkg-1.16.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.1.1.ebuild,v 1.2 2011/10/18 21:23:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.1.1.ebuild,v 1.3 2011/10/18 21:58:13 jer Exp $ EAPI=3 @@ -53,6 +53,7 @@ src_prepare() { -e '/850_Dpkg_Compression.t/d' \ || die "sed failed" + epatch "${FILESDIR}"/${PN}-1.16.1-bootstrap.patch eautoreconf } diff --git a/app-arch/dpkg/dpkg-1.16.1.ebuild b/app-arch/dpkg/dpkg-1.16.1.ebuild index 764d159ef32e..b3173c79b7ad 100644 --- a/app-arch/dpkg/dpkg-1.16.1.ebuild +++ b/app-arch/dpkg/dpkg-1.16.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.1.ebuild,v 1.2 2011/10/18 21:23:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.1.ebuild,v 1.3 2011/10/18 21:58:13 jer Exp $ EAPI=3 @@ -53,6 +53,7 @@ src_prepare() { -e '/850_Dpkg_Compression.t/d' \ || die "sed failed" + epatch "${FILESDIR}"/${PN}-1.16.1-bootstrap.patch eautoreconf } diff --git a/app-arch/dpkg/files/dpkg-1.16.1-bootstrap.patch b/app-arch/dpkg/files/dpkg-1.16.1-bootstrap.patch new file mode 100644 index 000000000000..71e224b2d733 --- /dev/null +++ b/app-arch/dpkg/files/dpkg-1.16.1-bootstrap.patch @@ -0,0 +1,23 @@ +--- 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; |