Fix building with GLIBC 2.10+ wrt #276761.

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

3 files changed, 102 insertions, 4 deletions

diff --git a/app-arch/star/ChangeLog b/app-arch/star/ChangeLog
index 0c8e53f595f4..96de21387ec0 100644
--- a/app-arch/star/ChangeLog
+++ b/app-arch/star/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/star
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/star/ChangeLog,v 1.80 2008/10/29 15:48:36 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/star/ChangeLog,v 1.81 2009/08/09 17:08:52 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> star-1.5.ebuild,
+  +files/star-1.5-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #276761.
 
   29 Oct 2008; Peter Volkov <pva@gentoo.org> -star-1.5_alpha87.ebuild,
   -star-1.5_alpha88.ebuild, -star-1.5_alpha89.ebuild:
diff --git a/app-arch/star/files/star-1.5-glibc-2.10.patch b/app-arch/star/files/star-1.5-glibc-2.10.patch
new file mode 100644
index 000000000000..402a7dcc3734
--- /dev/null
+++ b/app-arch/star/files/star-1.5-glibc-2.10.patch
@@ -0,0 +1,92 @@
+diff -urNp star-1.5-orig/include/schily/schily.h star-1.5/include/schily/schily.h
+--- star-1.5-orig/include/schily/schily.h	2008-02-16 16:32:01.000000000 +0100
++++ star-1.5/include/schily/schily.h	2009-04-08 10:49:17.000000000 +0200
+@@ -113,7 +113,7 @@ extern	int	fexecle __PR((const char *, F
+ 		/* 6th arg not const, fexecv forces av[ac] = NULL */
+ extern	int	fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
+ 							char **));
+-extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
++extern	int	sch_fexecve __PR((const char *, FILE *, FILE *, FILE *,
+ 					char * const *, char * const *));
+ extern	int	fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
+ extern	int	fspawnl __PR((FILE *, FILE *, FILE *,
+@@ -243,7 +243,7 @@ extern	char	*fillbytes __PR((void *, int
+ extern	char	*findbytes __PR((const void *, int, char));
+ extern	int	findline __PR((const char *, char, const char *,
+ 							int, char **, int));
+-extern	int	getline __PR((char *, int));
++extern	int	sch_getline __PR((char *, int));
+ extern	int	getstr __PR((char *, int));
+ extern	int	breakline __PR((char *, char, char **, int));
+ extern	int	getallargs __PR((int *, char * const**, const char *, ...));
+diff -urNp star-1.5-orig/lib/fexec.c star-1.5/lib/fexec.c
+--- star-1.5-orig/lib/fexec.c	2007-07-01 12:04:35.000000000 +0200
++++ star-1.5/lib/fexec.c	2009-04-08 10:54:05.000000000 +0200
+@@ -165,7 +165,7 @@ fexecle(name, in, out, err, va_alist)
+ 	} while (p != NULL);
+ 	va_end(args);
+ 
+-	ret = fexecve(name, in, out, err, av, env);
++	ret = sch_fexecve(name, in, out, err, av, env);
+ 	if (av != xav)
+ 		free(av);
+ 	return (ret);
+@@ -179,11 +179,11 @@ fexecv(name, in, out, err, ac, av)
+ 	char *av[];
+ {
+ 	av[ac] = NULL;			/*  force list to be null terminated */
+-	return (fexecve(name, in, out, err, av, environ));
++	return (sch_fexecve(name, in, out, err, av, environ));
+ }
+ 
+ EXPORT int
+-fexecve(name, in, out, err, av, env)
++sch_fexecve(name, in, out, err, av, env)
+ 	const char *name;
+ 	FILE *in, *out, *err;
+ 	char * const av[], * const env[];
+diff -urNp star-1.5-orig/lib/libschily-mapvers star-1.5/lib/libschily-mapvers
+--- star-1.5-orig/lib/libschily-mapvers	2007-10-06 15:21:55.000000000 +0200
++++ star-1.5/lib/libschily-mapvers	2009-04-08 10:54:21.000000000 +0200
+@@ -77,7 +77,7 @@ global:
+ 	fexecl;
+ 	fexecle;
+ 	fexecv;
+-	fexecve;
++	sch_fexecve;
+ 	ffileread;
+ 	ffilewrite;
+ 	fgetline;
+@@ -123,7 +123,7 @@ global:
+ 	geterrno;
+ 	getfiles;
+ 	getfp;
+-	getline;
++	sch_getline;
+ 	getmainfp;
+ 	#getstr;
+ 	#handlecond;
+diff -urNp star-1.5-orig/lib/stdio/fgetline.c star-1.5/lib/stdio/fgetline.c
+--- star-1.5-orig/lib/stdio/fgetline.c	2004-09-25 14:23:36.000000000 +0200
++++ star-1.5/lib/stdio/fgetline.c	2009-04-08 10:51:39.000000000 +0200
+@@ -61,7 +61,7 @@ fgetline(f, buf, len)
+ }
+ 
+ EXPORT int
+-getline(buf, len)
++sch_getline(buf, len)
+ 	char	*buf;
+ 	int	len;
+ {
+diff -urNp star-1.5-orig/libfind/find.c star-1.5/libfind/find.c
+--- star-1.5-orig/libfind/find.c	2008-04-10 19:04:54.000000000 +0200
++++ star-1.5/libfind/find.c	2009-04-08 10:54:48.000000000 +0200
+@@ -1730,7 +1730,7 @@ doexec(f, ac, av, state)
+ #endif
+ 		av[ac] = NULL;	/* -exec {} \; is not NULL terminated */
+ 
+-		fexecve(av[0], state->std[0], state->std[1], state->std[2],
++		sch_fexecve(av[0], state->std[0], state->std[1], state->std[2],
+ 							av, state->env);
+ #ifdef	PLUS_DEBUG
+ 		error("argsize %d\n",
diff --git a/app-arch/star/star-1.5.ebuild b/app-arch/star/star-1.5.ebuild
index d7b1897ddd51..efda664f5a6a 100644
--- a/app-arch/star/star-1.5.ebuild
+++ b/app-arch/star/star-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.5.ebuild,v 1.8 2008/05/24 13:30:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.5.ebuild,v 1.9 2009/08/09 17:08:52 ssuominen Exp $
 
 inherit eutils toolchain-funcs
 
@@ -23,6 +23,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+
 	cd "${S}"/DEFAULTS
 	sed -i \
 		-e 's:/opt/schily:/usr:g' \