[Pkg-openldap-devel] r802 - openldap/trunk-2.3/debian/patches

[Russ Allbery]

Author: rra
Date: 2007-05-23 22:18:17 +0000 (Wed, 23 May 2007)
New Revision: 802

Added:
   openldap/trunk-2.3/debian/patches/use-lpthread
Removed:
   openldap/trunk-2.3/debian/patches/use-lpthreads
Modified:
   openldap/trunk-2.3/debian/patches/series
Log:
Rename the use-lpthreads patch to have a name that's more accurate for
what it does.  Fix the coding style.  Add a header explaining the patch
and note the upstream ITS.


Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2007-05-23 22:06:41 UTC (rev 801)
+++ openldap/trunk-2.3/debian/patches/series	2007-05-23 22:18:17 UTC (rev 802)
@@ -1,5 +1,5 @@
 man-slapd -p0
-use-lpthreads
+use-lpthread
 slurpd-in-spool
 ntlm-ldap_h-hack -p0
 ntlm_c

Copied: openldap/trunk-2.3/debian/patches/use-lpthread (from rev 799, openldap/trunk-2.3/debian/patches/use-lpthreads)
===================================================================
--- openldap/trunk-2.3/debian/patches/use-lpthread	                        (rev 0)
+++ openldap/trunk-2.3/debian/patches/use-lpthread	2007-05-23 22:18:17 UTC (rev 802)
@@ -0,0 +1,17 @@
+Try -lpthread before -pthread because at least as of 24 Apr 2005 mipsel
+didn't like -pthread.
+
+ITS#4981
+
+Index: openldap2.3/configure.in
+===================================================================
+--- openldap2.3.orig/configure.in	2007-05-23 15:05:12.000000000 -0700
++++ openldap2.3/configure.in	2007-05-23 15:09:38.000000000 -0700
+@@ -1489,6 +1489,7 @@ case $ol_with_threads in auto | yes | po
+ 		
+ dnl		OL_PTHREAD_TRY([-mt],		[ol_cv_pthread_mt])
+ 		OL_PTHREAD_TRY([-kthread],	[ol_cv_pthread_kthread])
++		OL_PTHREAD_TRY([-lpthread],	[ol_cv_pthread_lpthread])
+ 		OL_PTHREAD_TRY([-pthread],	[ol_cv_pthread_pthread])
+ 		OL_PTHREAD_TRY([-pthreads],	[ol_cv_pthread_pthreads])
+ 		OL_PTHREAD_TRY([-mthreads],	[ol_cv_pthread_mthreads])

Deleted: openldap/trunk-2.3/debian/patches/use-lpthreads
===================================================================
--- openldap/trunk-2.3/debian/patches/use-lpthreads	2007-05-23 22:06:41 UTC (rev 801)
+++ openldap/trunk-2.3/debian/patches/use-lpthreads	2007-05-23 22:18:17 UTC (rev 802)
@@ -1,12 +0,0 @@
-Index: openldap2.3/configure.in
-===================================================================
---- openldap2.3.orig/configure.in	2007-05-23 13:06:38.000000000 -0700
-+++ openldap2.3/configure.in	2007-05-23 13:06:40.000000000 -0700
-@@ -1489,6 +1489,7 @@ case $ol_with_threads in auto | yes | po
- 		
- dnl		OL_PTHREAD_TRY([-mt],		[ol_cv_pthread_mt])
- 		OL_PTHREAD_TRY([-kthread],	[ol_cv_pthread_kthread])
-+    OL_PTHREAD_TRY([-lpthread], [ol_cv_pthread_lpthread])
- 		OL_PTHREAD_TRY([-pthread],	[ol_cv_pthread_pthread])
- 		OL_PTHREAD_TRY([-pthreads],	[ol_cv_pthread_pthreads])
- 		OL_PTHREAD_TRY([-mthreads],	[ol_cv_pthread_mthreads])