diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2006-12-27 04:19:48 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2006-12-27 04:19:48 +0000 |
| commit | 48053e5573c23afce8d1070a6b338cedd678f160 (patch) | |
| tree | 56ca310be0d50310ef21005a5e506aa21531c22f /www-servers | |
| parent | added ~ppc64 (diff) | |
| download | gentoo-2-48053e5573c23afce8d1070a6b338cedd678f160.tar.gz gentoo-2-48053e5573c23afce8d1070a6b338cedd678f160.tar.bz2 gentoo-2-48053e5573c23afce8d1070a6b338cedd678f160.zip | |
Fix building with GCC 4. Thanks to eastx7g02 sneakermail com, bug #151049.
(Portage version: 2.1.2_rc4-r1)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/aolserver/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/aolserver/aolserver-4.0.10.ebuild | 6 | ||||
| -rw-r--r-- | www-servers/aolserver/files/4.0.10/aolserver-4.0.10-gcc41.patch | 12 |
3 files changed, 23 insertions, 3 deletions
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 <dirtyepic@gentoo.org> + -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 <wormo@gentoo.org> 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. |