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

Package-Manager: portage-2.1-r2

5 files changed, 79 insertions, 9 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/Manifest b/net-proxy/oops/Manifest
index 8d470cabad34..1716902e18ae 100644
--- a/net-proxy/oops/Manifest
+++ b/net-proxy/oops/Manifest
@@ -1,18 +1,47 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 69368b8a5a55482166634c59b0c919c1 ChangeLog 3510
-MD5 a36b9f44efe9372d826e375c0b562cf4 files/digest-oops-1.5.24_pre20050503-r1 140
+AUX modules-as-needed.patch 938 RMD160 826cb10345b052147fbab23aead070749f977722 SHA1 112464fba1af28a7bfe3d6b2a1456896b73a7962 SHA256 38a8739282054477dc4488875a8989579565ba13b8f49ae83e2d6b09348117e1
 MD5 1713d77ed9574b4428db71709b3a5ee2 files/modules-as-needed.patch 938
+RMD160 826cb10345b052147fbab23aead070749f977722 files/modules-as-needed.patch 938
+SHA256 38a8739282054477dc4488875a8989579565ba13b8f49ae83e2d6b09348117e1 files/modules-as-needed.patch 938
+AUX oops-1.5.24-pthread-rwlock.patch 1035 RMD160 56f3325959ef144d8487d82792d2bcd73d5bf74c SHA1 59605a5e3bf6bf46468286a473c60374bc00059f SHA256 35ed9aeee36821b09c12cd9d612d8f5117eba75f3cb8a8517f07591f15d78a55
+MD5 217321f1d63a4966c983a3036949a208 files/oops-1.5.24-pthread-rwlock.patch 1035
+RMD160 56f3325959ef144d8487d82792d2bcd73d5bf74c files/oops-1.5.24-pthread-rwlock.patch 1035
+SHA256 35ed9aeee36821b09c12cd9d612d8f5117eba75f3cb8a8517f07591f15d78a55 files/oops-1.5.24-pthread-rwlock.patch 1035
+AUX oops-1.5.24-textrel.patch 803 RMD160 7cc63f2d576e99232392528eb65ed09ea4d0150a SHA1 982151649995f1376d608a783addb04b5ba77489 SHA256 56acbb949120570746c200a97c4a41579366c4a00718baa3af56c7f7d2ea16f3
 MD5 1d6a6205eb41cb5a0c93d0c643375dbf files/oops-1.5.24-textrel.patch 803
+RMD160 7cc63f2d576e99232392528eb65ed09ea4d0150a files/oops-1.5.24-textrel.patch 803
+SHA256 56acbb949120570746c200a97c4a41579366c4a00718baa3af56c7f7d2ea16f3 files/oops-1.5.24-textrel.patch 803
+AUX oops.cfg 17860 RMD160 fc772f270c505c83680568d166e006236ce36105 SHA1 7995c8d80bbe76a7fce45e20f712d5b3469b02bb SHA256 8e414b7261e5798f16ee97f148b883c75a0618997549fd2f701a820bcc0fbb2f
 MD5 b9d0b25939387c6ed9d3fa375d606385 files/oops.cfg 17860
+RMD160 fc772f270c505c83680568d166e006236ce36105 files/oops.cfg 17860
+SHA256 8e414b7261e5798f16ee97f148b883c75a0618997549fd2f701a820bcc0fbb2f files/oops.cfg 17860
+AUX oops.initd 515 RMD160 da1f9e004a8173f74a2b2086f5ae5c88e4d3bc62 SHA1 37a0a31a0ff9e87c26901332f1d682e538bfa2b7 SHA256 be8deff3c52531ff1e31f47851672e877854082290e78d1f4c998b787f6c7279
 MD5 5428b5e23f57fbf884ff1b92bd9ad562 files/oops.initd 515
+RMD160 da1f9e004a8173f74a2b2086f5ae5c88e4d3bc62 files/oops.initd 515
+SHA256 be8deff3c52531ff1e31f47851672e877854082290e78d1f4c998b787f6c7279 files/oops.initd 515
+DIST oops-1.5.23.tar.gz 473290 RMD160 295122ff9ce7e045cf7ddda035479056ba9e5881 SHA1 6eb9b77a5e4ef67896f46d5e1452506f2dff34de SHA256 b9ab7c0b5b11de7944f098d6f99158fe1b9c3b9cf82fe7827685c6cec8ccfa04
+DIST oops-1.5.24_pre20050503.patch.gz 101103 RMD160 dffdc6842db8c78d87c26fe180302b56608f1f2e SHA1 9d32934752729359056a9a6913b3db9008330994 SHA256 954e59d046096867a8e818bf47190ab06c8416abb80d151757825a664192aded
+EBUILD oops-1.5.24_pre20050503-r1.ebuild 2669 RMD160 0be9049176fd20a16b64cffdc6e312e551abb053 SHA1 43f8b75283cf36b6a5d5c893ddaaea6f048c3080 SHA256 17a99f21f89b50de22a54ffc096b41507426ff1bcba922e629783e9f27ce80e9
+MD5 65de4ea95394fc550f2d24d5b4f88451 oops-1.5.24_pre20050503-r1.ebuild 2669
+RMD160 0be9049176fd20a16b64cffdc6e312e551abb053 oops-1.5.24_pre20050503-r1.ebuild 2669
+SHA256 17a99f21f89b50de22a54ffc096b41507426ff1bcba922e629783e9f27ce80e9 oops-1.5.24_pre20050503-r1.ebuild 2669
+MISC ChangeLog 3726 RMD160 9ec6097c2d6ea05c958064ba492fb430675dc067 SHA1 b00e7adbde62d2f908149e92e182b1ea6f047e63 SHA256 12ab1f17caeaa8aa4f6734e00e64fe7cf9d8720b08200407090b8fc11715a87d
+MD5 970f4ed1268ce97aae4ef19ae00cda83 ChangeLog 3726
+RMD160 9ec6097c2d6ea05c958064ba492fb430675dc067 ChangeLog 3726
+SHA256 12ab1f17caeaa8aa4f6734e00e64fe7cf9d8720b08200407090b8fc11715a87d ChangeLog 3726
+MISC metadata.xml 241 RMD160 49452806ed5c451d97e1fa0ea2502e0eee3c41d6 SHA1 e9ba513731cedbbad85c4e23eead942b5c34ccc8 SHA256 62971ad1585c672fdea039fe2b299a5655375b23f78d7c2149901e2b29407bd3
 MD5 0bba18e763cee72e6af83a6bc6e1db87 metadata.xml 241
-MD5 71643fb830a4bf39ded648a74997990e oops-1.5.24_pre20050503-r1.ebuild 2618
+RMD160 49452806ed5c451d97e1fa0ea2502e0eee3c41d6 metadata.xml 241
+SHA256 62971ad1585c672fdea039fe2b299a5655375b23f78d7c2149901e2b29407bd3 metadata.xml 241
+MD5 f4aba49a377f0c83dc835a4831e4dcf8 files/digest-oops-1.5.24_pre20050503-r1 512
+RMD160 eabf9ca7f832e3a75feae3f31d5ebc427cf77191 files/digest-oops-1.5.24_pre20050503-r1 512
+SHA256 0a0c1cf95c181b9ac97b8cccf2de02faf359831d1c4cd66ef169d6d72fdb809d files/digest-oops-1.5.24_pre20050503-r1 512
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEblL8jG8pv1lIUX4RAqsuAKDAwYTN5mODyeWyYLchdnDj+PDaawCg2uwu
-VEEUCuoBNVTp+HlQJVlJd/w=
-=yhyI
+iD8DBQFE/mEf3sf9c6kjmR8RAkckAJ9d9WheTu0nRWu0rHcUp3XNiyIulgCgo/sa
+5zaCrQbbgQWYlu0WmOXVODo=
+=cYqN
 -----END PGP SIGNATURE-----
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