Add fix from upstrem for building with glibc-2.12 #332839 by Darren Smith.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 78 insertions, 13 deletions

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 2c4040895ab1..55aadfd64dbf 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/m4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.131 2010/03/31 11:51:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.132 2010/08/15 17:39:44 vapier Exp $
+
+  15 Aug 2010; Mike Frysinger <vapier@gentoo.org> m4-1.4.14-r1.ebuild,
+  +files/m4-1.4.14-glibc-2.12.patch:
+  Add fix from upstrem for building with glibc-2.12 #332839 by Darren Smith.
 
 *m4-1.4.14-r1 (31 Mar 2010)
 
diff --git a/sys-devel/m4/files/m4-1.4.14-glibc-2.12.patch b/sys-devel/m4/files/m4-1.4.14-glibc-2.12.patch
new file mode 100644
index 000000000000..6507a7175dc9
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.14-glibc-2.12.patch
@@ -0,0 +1,64 @@
+https://bugs.gentoo.org/332839
+
+From 1359a849055a66eddffe7753485e0f29fb85ef31 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Fri, 4 Jun 2010 06:07:38 -0600
+Subject: [PATCH] Fix build on newer glibc.
+
+POSIX allows, but does not require, that <fcntl.h> implicitly
+includes <sys/stat.h>.  Until recent glibc, most systems did
+this implicit inclusion, and m4 was mistakenly relying on it.
+
+* src/m4.h (includes): Add <sys/stat.h>.
+* THANKS: Update.
+Reported by Todd Rinaldo.
+
+Signed-off-by: Eric Blake <eblake@redhat.com>
+---
+ ChangeLog |    7 +++++++
+ THANKS    |    2 ++
+ src/m4.h  |    1 +
+ 3 files changed, 10 insertions(+), 0 deletions(-)
+
+2010-06-04  Eric Blake  <eblake@redhat.com>
+
+	Fix build on newer glibc.
+	* src/m4.h (includes): Add <sys/stat.h>.
+	* THANKS: Update.
+	Reported by Todd Rinaldo.
+
+diff --git a/THANKS b/THANKS
+index f43e2aa..6f49e78 100644
+--- a/THANKS
++++ b/THANKS
+@@ -43,6 +43,7 @@ Frank Schwidom          schwidom@impernet.de
+ Gary V. Vaughan         gary@gnu.org
+ Geoff Russell           grussell@guest.adelaide.edu.au
+ Giovanni Toffetti       toffettg@lu.unisi.ch
++Giuseppe Scrivano       gscrivano@gnu.org
+ Greg A. Woods           woods@web.apc.org
+ Hal Peterson            hrp@pecan.cray.com
+ Hoang Uong              hoang@ornews.intel.com
+@@ -114,6 +115,7 @@ Steve Williamson        willy@uinpla.npl.uiuc.edu
+ Steven Augart           saugart@yahoo.com
+ Thomas Klausner         tk@giga.or.at
+ Thorsten Ohl            ohl@physics.harvard.edu
++Todd Rinaldo            toddr@cpanel.net
+ Tom G. Christensen      tgc@jupiterrise.com
+ Tom McConnell           tmcconne@sedona.intel.com
+ Tom Quinn               trq@dionysos.thphys.ox.ac.uk
+diff --git a/src/m4.h b/src/m4.h
+index ccd9936..70dc7a8 100644
+--- a/src/m4.h
++++ b/src/m4.h
+@@ -32,6 +32,7 @@
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <string.h>
++#include <sys/stat.h>
+ #include <sys/types.h>
+ 
+ #include "binary-io.h"
+-- 
+1.7.2
+
diff --git a/sys-devel/m4/m4-1.4.14-r1.ebuild b/sys-devel/m4/m4-1.4.14-r1.ebuild
index cb3cff1a59fa..759b537475bf 100644
--- a/sys-devel/m4/m4-1.4.14-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.14-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.14-r1.ebuild,v 1.1 2010/03/31 11:51:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.14-r1.ebuild,v 1.2 2010/08/15 17:39:44 vapier Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -14,26 +16,21 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us
-DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )"
+DEPEND="app-arch/xz-utils"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.4.14-gnulib_spawn.patch # 310335
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gnulib_spawn.patch #310335
+	epatch "${FILESDIR}"/${P}-glibc-2.12.patch #332839
 }
 
-src_compile() {
+src_configure() {
 	# Disable automagic dependency over libsigsegv; see bug #278026
 	export ac_cv_libsigsegv=no
 
 	local myconf=""
 	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
-	econf \
-		--enable-changeword \
-		${myconf} \
-		|| die
-	emake || die
+	econf --enable-changeword ${myconf}
 }
 
 src_test() {