rpms/apr/devel apr-1.2.2-pthreadprio.patch, NONE, 1.1 apr.spec, 1.42, 1.43

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/apr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13724

Modified Files:
	apr.spec 
Added Files:
	apr-1.2.2-pthreadprio.patch 
Log Message:
* Wed Jan  4 2006 Joe Orton <jorton at redhat.com> 1.2.2-6
- fix build with recent glibc (#176911)


apr-1.2.2-pthreadprio.patch:
 proc_mutex.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE apr-1.2.2-pthreadprio.patch ---

Fix build with recent glibc.

--- apr-1.2.2/locks/unix/proc_mutex.c.pthreadprio
+++ apr-1.2.2/locks/unix/proc_mutex.c
@@ -335,6 +335,8 @@
         pthread_mutexattr_destroy(&mattr);
         return rv;
     }
+
+#ifdef PTHREAD_PRIO_INHERIT
     if ((rv = pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT))) {
 #ifdef PTHREAD_SETS_ERRNO
         rv = errno;
@@ -344,6 +346,7 @@
         return rv;
     }
 #endif
+#endif
 
     if ((rv = pthread_mutex_init(new_mutex->pthread_interproc, &mattr))) {
 #ifdef PTHREAD_SETS_ERRNO


Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- apr.spec	3 Jan 2006 20:02:06 -0000	1.42
+++ apr.spec	4 Jan 2006 11:28:25 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.2
-Release: 5.2
+Release: 6
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -16,6 +16,7 @@
 Patch6: apr-1.2.2-locktimeout.patch
 Patch7: apr-1.2.2-libdir.patch
 Patch8: apr-1.2.2-seekflush.patch
+Patch9: apr-1.2.2-pthreadprio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen
 Conflicts: subversion < 0.20.1-2
@@ -49,6 +50,7 @@
 %patch6 -p1 -b .locktimeout
 %patch7 -p1 -b .libdir
 %patch8 -p1 -b .seekflush
+%patch9 -p1 -b .pthreadprio
 
 %build
 # regenerate configure script etc.
@@ -120,6 +122,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Wed Jan  4 2006 Joe Orton <jorton at redhat.com> 1.2.2-6
+- fix build with recent glibc (#176911)
+
 * Tue Jan  3 2006 Jesse Keating <jkeating at redhat.com> 1.2.2-5.2
 - rebuilt again