Fix broken build on gcc 4.1 - use glibc implementation of pthread_rwlock (#145868).

(Portage version: 2.1-r2)

4 files changed, 43 insertions, 2 deletions

diff --git a/net-proxy/oops/ChangeLog b/net-proxy/oops/ChangeLog
index b566a6d65dd1..3a95e210b8e9 100644
--- a/net-proxy/oops/ChangeLog
+++ b/net-proxy/oops/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/oops
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.10 2006/05/19 23:21:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.11 2006/09/06 05:48:04 mrness Exp $
+
+  06 Sep 2006; Alin Nastac <mrness@gentoo.org>
+  +files/oops-1.5.24-pthread-rwlock.patch,
+  oops-1.5.24_pre20050503-r1.ebuild:
+  Fix broken build on gcc 4.1 - use glibc implementation of pthread_rwlock
+  (#145868).
 
   19 May 2006; Alin Nastac <mrness@gentoo.org>
   +files/modules-as-needed.patch, files/oops.cfg,
diff --git a/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1 b/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1
index 61ed89b1cbe4..f1fbcce3d239 100644
--- a/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1
+++ b/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1
@@ -1,2 +1,6 @@
 MD5 bfa19752af517bb5a6cd746acf61064c oops-1.5.23.tar.gz 473290
+RMD160 295122ff9ce7e045cf7ddda035479056ba9e5881 oops-1.5.23.tar.gz 473290
+SHA256 b9ab7c0b5b11de7944f098d6f99158fe1b9c3b9cf82fe7827685c6cec8ccfa04 oops-1.5.23.tar.gz 473290
 MD5 8fbd0e763338eba31949d2a20217707a oops-1.5.24_pre20050503.patch.gz 101103
+RMD160 dffdc6842db8c78d87c26fe180302b56608f1f2e oops-1.5.24_pre20050503.patch.gz 101103
+SHA256 954e59d046096867a8e818bf47190ab06c8416abb80d151757825a664192aded oops-1.5.24_pre20050503.patch.gz 101103
diff --git a/net-proxy/oops/files/oops-1.5.24-pthread-rwlock.patch b/net-proxy/oops/files/oops-1.5.24-pthread-rwlock.patch
new file mode 100644
index 000000000000..2606af7330d5
--- /dev/null
+++ b/net-proxy/oops/files/oops-1.5.24-pthread-rwlock.patch
@@ -0,0 +1,30 @@
+diff -Nru oops-1.5.23.orig/src/lib/rwlock/rwlock.c oops-1.5.23/src/lib/rwlock/rwlock.c
+--- oops-1.5.23.orig/src/lib/rwlock/rwlock.c	2000-11-29 19:03:35.000000000 +0200
++++ oops-1.5.23/src/lib/rwlock/rwlock.c	2006-09-06 00:30:36.000000000 +0300
+@@ -53,6 +53,8 @@
+ #include <pthread.h>
+ #include "rwlock.h"
+ 
++#if defined(OOPS_IMPLEMENT_RWLOCK)
++
+ /* maximum number of times a read lock may be obtained */
+ #define	MAX_READ_LOCKS		(INT_MAX - 1)
+ 
+@@ -375,4 +377,6 @@
+ 	return(0);
+ }
+ 
++#endif /* defined(OOPS_IMPLEMENT_RWLOCK) */
++
+ #endif /* _THREAD_SAFE || _PTHREADS || _REENTRANT */
+diff -Nru oops-1.5.23.orig/src/lib/rwlock/rwlock.h oops-1.5.23/src/lib/rwlock/rwlock.h
+--- oops-1.5.23.orig/src/lib/rwlock/rwlock.h	2003-10-06 17:15:40.000000000 +0300
++++ oops-1.5.23/src/lib/rwlock/rwlock.h	2006-09-06 00:29:46.000000000 +0300
+@@ -53,6 +53,7 @@
+ 
+ #if	!defined(PTHREAD_RWLOCK_INITIALIZER)
+ #define	PTHREAD_RWLOCK_INITIALIZER	NULL
++#define OOPS_IMPLEMENT_RWLOCK 1
+ 
+ struct	pthread_rwlock {
+ 	pthread_mutex_t	lock;		/* monitor lock */
diff --git a/net-proxy/oops/oops-1.5.24_pre20050503-r1.ebuild b/net-proxy/oops/oops-1.5.24_pre20050503-r1.ebuild
index 9708dcfbb565..e5bf2efbf85e 100644
--- a/net-proxy/oops/oops-1.5.24_pre20050503-r1.ebuild
+++ b/net-proxy/oops/oops-1.5.24_pre20050503-r1.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/net-proxy/oops/oops-1.5.24_pre20050503-r1.ebuild,v 1.4 2006/05/19 23:21:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/oops-1.5.24_pre20050503-r1.ebuild,v 1.5 2006/09/06 05:48:04 mrness Exp $
 
 inherit eutils flag-o-matic
 
@@ -36,6 +36,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${WORKDIR}/${P}.patch"
 	epatch "${FILESDIR}/${P/_*}-textrel.patch"
+	epatch "${FILESDIR}/${P/_*}-pthread-rwlock.patch"
 	epatch "${FILESDIR}/modules-as-needed.patch"
 	sed -i -e 's:/usr/local/lib/libpcre:/usr/lib/libpcre:g' configure
 	sed -i -e 's:y\.tab\.h:y.tab.c:' src/Makefile.in