Compilefix for USE="slabs-reassign" and picky GCC versions.

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

3 files changed, 32 insertions, 2 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index adc92b2aac1d..a4e63e2d808e 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/memcached
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.85 2009/05/26 01:42:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.86 2009/06/03 21:17:42 robbat2 Exp $
+
+  03 Jun 2009; Robin H. Johnson <robbat2@gentoo.org>
+  memcached-1.3.3-r2.ebuild, +files/memcached-1.3.3-gcc4-slab-fixup.patch:
+  Compilefix for USE="slabs-reassign" and picky GCC versions.
 
   26 May 2009; Jeroen Roovers <jer@gentoo.org> memcached-1.3.3-r2.ebuild:
   Stable for HPPA (bug #271246).
diff --git a/net-misc/memcached/files/memcached-1.3.3-gcc4-slab-fixup.patch b/net-misc/memcached/files/memcached-1.3.3-gcc4-slab-fixup.patch
new file mode 100644
index 000000000000..5b703502e73c
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.3.3-gcc4-slab-fixup.patch
@@ -0,0 +1,25 @@
+Compile fix for illegal syntax to make GCC4 happy.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar -Nuar memcached-1.3.3.orig/slabs.c memcached-1.3.3/slabs.c
+--- memcached-1.3.3.orig/slabs.c	2009-04-02 12:29:32.000000000 -0700
++++ memcached-1.3.3/slabs.c	2009-06-03 14:11:04.134757232 -0700
+@@ -419,7 +419,7 @@
+     slab = p->slab_list[p->killing - 1];
+     slab_end = (char*)slab + POWER_BLOCK;
+ 
+-    for (iter = slab; iter < slab_end; (char*)iter += p->size) {
++    for (iter = slab; iter < slab_end; iter = (char*)iter + p->size) {
+         item *it = (item *)iter;
+         if (it->slabs_clsid) {
+             if (it->refcount) was_busy = true;
+@@ -449,7 +449,7 @@
+     dp->end_page_free = dp->perslab;
+     /* this isn't too critical, but other parts of the code do asserts to
+        make sure this field is always 0.  */
+-    for (iter = slab; iter < slab_end; (char*)iter += dp->size) {
++    for (iter = slab; iter < slab_end; iter = (char*)iter + dp->size) {
+         ((item *)iter)->slabs_clsid = 0;
+     }
+     return 1;
diff --git a/net-misc/memcached/memcached-1.3.3-r2.ebuild b/net-misc/memcached/memcached-1.3.3-r2.ebuild
index 7f60b225e6f7..060ee702e775 100644
--- a/net-misc/memcached/memcached-1.3.3-r2.ebuild
+++ b/net-misc/memcached/memcached-1.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.3-r2.ebuild,v 1.2 2009/05/26 01:42:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.3-r2.ebuild,v 1.3 2009/06/03 21:17:42 robbat2 Exp $
 
 inherit eutils autotools flag-o-matic
 
@@ -28,6 +28,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
 	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
 	eautoreconf
 	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN