summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-10-28 21:21:26 +0000
committerMike Frysinger <vapier@gentoo.org>2007-10-28 21:21:26 +0000
commit8a1fc0758e57d4ba8c7f3aa916c6d9f2b75f353c (patch)
tree7f0653277d206bc9c5c25a5717d3dacfbb7d7d2f /sys-apps/findutils
parentold (diff)
downloadgentoo-2-8a1fc0758e57d4ba8c7f3aa916c6d9f2b75f353c.tar.gz
gentoo-2-8a1fc0758e57d4ba8c7f3aa916c6d9f2b75f353c.tar.bz2
gentoo-2-8a1fc0758e57d4ba8c7f3aa916c6d9f2b75f353c.zip
Fix from upstream for building with newer toolchain packages #197326 by Peter Alfredsen.
(Portage version: 2.1.3.16)
Diffstat (limited to 'sys-apps/findutils')
-rw-r--r--sys-apps/findutils/ChangeLog7
-rw-r--r--sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch19
-rw-r--r--sys-apps/findutils/findutils-4.3.8-r1.ebuild5
3 files changed, 28 insertions, 3 deletions
diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index b31bae9dcf21..fd805046e0ec 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/findutils
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.144 2007/09/28 17:14:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.145 2007/10/28 21:21:25 vapier Exp $
+
+ 28 Oct 2007; Mike Frysinger <vapier@gentoo.org>
+ +files/findutils-4.3.8-gnulib-stddef.patch, findutils-4.3.8-r1.ebuild:
+ Fix from upstream for building with newer toolchain packages #197326 by
+ Peter Alfredsen.
28 Sep 2007; nixnut <nixnut@gentoo.org> findutils-4.3.8-r1.ebuild:
Stable on ppc wrt bug 194010
diff --git a/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch b/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch
new file mode 100644
index 000000000000..1f17bea5b50c
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/197326
+
+2007-06-10 Bruno Haible <bruno@clisp.org>
+
+ * lib/mbiter.h: Include <stddef.h>, needed for ptrdiff_t.
+ * lib/mbuiter.h: Likewise.
+
+diff --git a/gnulib/lib/mbuiter.h b/gnulib/lib/mbuiter.h
+index e6ad488..c4ceddb 100644
+--- a/gnulib/lib/mbuiter.h
++++ b/gnulib/lib/mbuiter.h
+@@ -92,6 +92,7 @@
+
+ #include <assert.h>
+ #include <stdbool.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+
diff --git a/sys-apps/findutils/findutils-4.3.8-r1.ebuild b/sys-apps/findutils/findutils-4.3.8-r1.ebuild
index b37d65d97f82..4c60bb5db8b5 100644
--- a/sys-apps/findutils/findutils-4.3.8-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.3.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.8-r1.ebuild,v 1.8 2007/09/28 17:14:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.8-r1.ebuild,v 1.9 2007/10/28 21:21:25 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -13,7 +13,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
IUSE="nls selinux static"
RDEPEND="selinux? ( sys-libs/libselinux )
@@ -29,6 +29,7 @@ src_unpack() {
# which is a secure version of locate. See bug 18729
sed -i '/^SUBDIRS/s/locate//' Makefile.in
+ epatch "${FILESDIR}"/${P}-gnulib-stddef.patch #197326
epatch "${FILESDIR}"/${P}-listfile-segv.patch #188249
use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
}