Add patch to build with GCC 4.1 (half committed upstream).

(Portage version: 2.1.2_pre1)

3 files changed, 39 insertions, 3 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 4aa0e3950184..29f8703698bb 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.27 2006/09/21 20:54:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.28 2006/09/22 05:16:42 flameeyes Exp $
+
+  22 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-lib-6.2-gcc41.patch, freebsd-lib-6.2_beta1.ebuild:
+  Add patch to build with GCC 4.1 (half committed upstream).
 
 *freebsd-lib-6.2_beta1 (21 Sep 2006)
 
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-gcc41.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-gcc41.patch
new file mode 100644
index 000000000000..e7addfaba401
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-gcc41.patch
@@ -0,0 +1,26 @@
+Index: fbsd-6.2/lib/libc/isc/eventlib_p.h
+===================================================================
+--- fbsd-6.2.orig/lib/libc/isc/eventlib_p.h
++++ fbsd-6.2/lib/libc/isc/eventlib_p.h
+@@ -280,6 +280,8 @@ evWait *evFreeWait(evContext_p *ctx, evW
+ #endif
+ 
+ /* Global options */
++#ifndef _LIBC
+ extern int	__evOptMonoTime;
++#endif
+ 
+ #endif /*_EVENTLIB_P_H*/
+Index: fbsd-6.2/lib/libc/resolv/res_debug.c
+===================================================================
+--- fbsd-6.2.orig/lib/libc/resolv/res_debug.c
++++ fbsd-6.2/lib/libc/resolv/res_debug.c
+@@ -472,7 +472,7 @@ const struct res_sym __p_type_syms[] = {
+ /*
+  * Names of DNS rcodes.
+  */
+-static const struct res_sym __p_rcode_syms[] = {
++const struct res_sym __p_rcode_syms[] = {
+ 	{ns_r_noerror,	"NOERROR",		"no error"},
+ 	{ns_r_formerr,	"FORMERR",		"format error"},
+ 	{ns_r_servfail,	"SERVFAIL",		"server failed"},
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta1.ebuild
index 84fd35a37943..39ca13c7b4e9 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta1.ebuild,v 1.1 2006/09/21 20:54:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta1.ebuild,v 1.2 2006/09/22 05:16:42 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
@@ -78,7 +78,8 @@ PATCHES="${FILESDIR}/${PN}-bsdxml.patch
 	${FILESDIR}/${PN}-6.0-flex-2.5.31.patch
 	${FILESDIR}/${PN}-6.0-binutils-asm.patch
 	${FILESDIR}/${PN}-6.0-ssp.patch
-	${FILESDIR}/${P}-csu-amd64.patch"
+	${FILESDIR}/${PN}-6.1-csu-amd64.patch
+	${FILESDIR}/${PN}-6.2-gcc41.patch"
 
 # Here we disable and remove source which we don't need or want
 # In order:
@@ -113,6 +114,11 @@ src_unpack() {
 		sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
 
 	sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine"
 }
 
 src_compile() {