From af30599e5c52e0f1518251dc41fc4257f027ff35 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Wed, 27 Dec 2006 04:19:48 +0000 Subject: [PATCH] Fix building with GCC 4. Thanks to eastx7g02 sneakermail com, bug #151049. Package-Manager: portage-2.1.2_rc4-r1 --- www-servers/aolserver/ChangeLog | 8 +++++++- www-servers/aolserver/aolserver-4.0.10.ebuild | 6 ++++-- .../files/4.0.10/aolserver-4.0.10-gcc41.patch | 12 ++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 www-servers/aolserver/files/4.0.10/aolserver-4.0.10-gcc41.patch diff --git a/www-servers/aolserver/ChangeLog b/www-servers/aolserver/ChangeLog index 6cb29ba6216b..7d0f0ac6af35 100644 --- a/www-servers/aolserver/ChangeLog +++ b/www-servers/aolserver/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/aolserver # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/ChangeLog,v 1.11 2006/08/17 04:20:24 wormo Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/ChangeLog,v 1.12 2006/12/27 04:19:48 dirtyepic Exp $ + + 27 Dec 2006; Ryan Hill + -files/4.0.9/Makefile.global, -files/4.0.9/aolserver.init, + -files/4.0.9/aolserver-4.0.9-nptl.patch, -files/4.0.9/config.tcl, + +files/4.0.10/aolserver-4.0.10-gcc41.patch, aolserver-4.0.10.ebuild: + Fix building with GCC 4. Thanks to eastx7g02 sneakermail com, bug #151049. 16 Aug 2006; Stephanie Lockwood-Childs aolserver-4.0.10.ebuild: diff --git a/www-servers/aolserver/aolserver-4.0.10.ebuild b/www-servers/aolserver/aolserver-4.0.10.ebuild index a2c82da73686..4c0e3099fbc8 100644 --- a/www-servers/aolserver/aolserver-4.0.10.ebuild +++ b/www-servers/aolserver/aolserver-4.0.10.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/www-servers/aolserver/aolserver-4.0.10.ebuild,v 1.6 2006/08/17 04:20:24 wormo Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/aolserver-4.0.10.ebuild,v 1.7 2006/12/27 04:19:48 dirtyepic Exp $ inherit eutils @@ -77,8 +77,10 @@ src_unpack() { find ${S} -type d -name CVS -prune | xargs rm -rf if use nptl; then - epatch ${FILESDIR}/${PV}/aolserver-${PV}-nptl.patch + epatch "${FILESDIR}"/${PV}/aolserver-${PV}-nptl.patch fi + + epatch "${FILESDIR}"/${PV}/aolserver-${PV}-gcc41.patch } src_compile() { diff --git a/www-servers/aolserver/files/4.0.10/aolserver-4.0.10-gcc41.patch b/www-servers/aolserver/files/4.0.10/aolserver-4.0.10-gcc41.patch new file mode 100644 index 000000000000..ee1bfbcff652 --- /dev/null +++ b/www-servers/aolserver/files/4.0.10/aolserver-4.0.10-gcc41.patch @@ -0,0 +1,12 @@ +diff -Naur aolserver-4.0.10-orig/nsd/conn.c aolserver-4.0.10/nsd/conn.c +--- aolserver-4.0.10-orig/nsd/conn.c 2006-12-26 21:54:45.000000000 -0600 ++++ aolserver-4.0.10/nsd/conn.c 2006-12-26 21:56:31.000000000 -0600 +@@ -840,7 +840,7 @@ + } + + result = Tcl_GetObjResult(interp); +- connPtr = (Conn *) conn = itPtr->conn; ++ connPtr = conn = (Conn *) itPtr->conn; + + /* + * Only the "isconnected" option operates without a conn. -- 2.26.2