diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-10-10 00:04:57 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-10-10 00:04:57 +0000 |
| commit | 5341a3b1faf6b566e25b19d11249c6b6b608bfee (patch) | |
| tree | 09787d3d0d362b216d9dc43688c667a3329054be | |
| parent | old (diff) | |
| download | gentoo-2-5341a3b1faf6b566e25b19d11249c6b6b608bfee.tar.gz gentoo-2-5341a3b1faf6b566e25b19d11249c6b6b608bfee.tar.bz2 gentoo-2-5341a3b1faf6b566e25b19d11249c6b6b608bfee.zip | |
Add fix from upstream for cross-compiling #328531 by Jacob Godserv.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
| -rw-r--r-- | app-arch/cpio/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/cpio/cpio-2.11.ebuild | 11 | ||||
| -rw-r--r-- | app-arch/cpio/files/cpio-2.11-stat.patch | 25 |
3 files changed, 38 insertions, 4 deletions
diff --git a/app-arch/cpio/ChangeLog b/app-arch/cpio/ChangeLog index a38772f21912..c215ca1bd251 100644 --- a/app-arch/cpio/ChangeLog +++ b/app-arch/cpio/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/cpio # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.113 2010/07/18 20:47:44 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.114 2010/10/10 00:04:57 vapier Exp $ + + 10 Oct 2010; Mike Frysinger <vapier@gentoo.org> cpio-2.11.ebuild, + +files/cpio-2.11-stat.patch: + Add fix from upstream for cross-compiling #328531 by Jacob Godserv. 18 Jul 2010; Joseph Jezak <josejx@gentoo.org> cpio-2.11.ebuild: Marked ppc stable for bug #314663. diff --git a/app-arch/cpio/cpio-2.11.ebuild b/app-arch/cpio/cpio-2.11.ebuild index 7e51fa2b9dcf..48aaa10d156d 100644 --- a/app-arch/cpio/cpio-2.11.ebuild +++ b/app-arch/cpio/cpio-2.11.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11.ebuild,v 1.7 2010/07/18 20:47:44 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11.ebuild,v 1.8 2010/10/10 00:04:57 vapier Exp $ EAPI="2" +inherit eutils + DESCRIPTION="A file archival tool which can also read and write tar files" HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html" SRC_URI="mirror://gnu/cpio/${P}.tar.bz2" @@ -13,12 +15,15 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="nls" +src_prepare() { + epatch "${FILESDIR}"/${P}-stat.patch #328531 +} + src_configure() { econf \ $(use_enable nls) \ --bindir=/bin \ - --with-rmt=/usr/sbin/rmt \ - || die + --with-rmt=/usr/sbin/rmt } src_install() { diff --git a/app-arch/cpio/files/cpio-2.11-stat.patch b/app-arch/cpio/files/cpio-2.11-stat.patch new file mode 100644 index 000000000000..dcd991e3f20c --- /dev/null +++ b/app-arch/cpio/files/cpio-2.11-stat.patch @@ -0,0 +1,25 @@ +http://bugs.gentoo.org/328531 + +From 3a7a1820d4cecbd77c7b74c785af5942510bf080 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org.ua> +Date: Thu, 22 Jul 2010 13:13:34 +0300 +Subject: [PATCH] Minor fix. + +* src/filetypes.h: Remove declarations of stat and lstat. +--- + src/filetypes.h | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/filetypes.h b/src/filetypes.h +index f80faab..81f0c32 100644 +--- a/src/filetypes.h ++++ b/src/filetypes.h +@@ -81,5 +81,3 @@ + #ifndef S_ISLNK + #define lstat stat + #endif +-int lstat (); +-int stat (); +-- +1.7.3 + |