From: Arch Librarian <arch@canonical.com>
Date: Thu, 14 Jul 2005 13:06:17 +0000 (+0000)
Subject: 2005-03-18  Tollef Fog Heen  <tfheen@err.no>
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c5248e621c409b58a42f7fd9622746531dd8820;p=pkg-config

2005-03-18  Tollef Fog Heen  <tfheen@err.no>
Author: tfheen
Date: 2005-03-18 08:04:33 GMT
2005-03-18  Tollef Fog Heen  <tfheen@err.no>

    * glib-patches/pthread-config-fix.diff: Add patch to detect
    pthreads properly on some architectures.  Thanks to Michael
    Haubenwallner for reporting this bug and providing a patch.
---

diff --git a/ChangeLog b/ChangeLog
index 00c9f80..2617fe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-18  Tollef Fog Heen  <tfheen@err.no>
+
+	* glib-patches/pthread-config-fix.diff: Add patch to detect
+	pthreads properly on some architectures.  Thanks to Michael
+	Haubenwallner for reporting this bug and providing a patch.
+
 2005-02-21  Tollef Fog Heen  <tfheen@err.no>
 
 	* parse.c (parse_package_file): Stop leaking file descriptors.
diff --git a/glib-patches/pthread-config-fix.diff b/glib-patches/pthread-config-fix.diff
new file mode 100644
index 0000000..36baf23
--- /dev/null
+++ b/glib-patches/pthread-config-fix.diff
@@ -0,0 +1,18 @@
+--- glib-1.2.8/configure.in	2000-05-25 02:29:09.000000000 +0200
++++ glib-1.2.8/configure.in	2004-10-13 09:45:16.965305752 +0200
+@@ -831,6 +831,7 @@
+ 		AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like)
+ 		# DCE Threads return -1 as failure, posix ETIMEDOUT.
+ 		AC_TRY_RUN([#include <pthread.h>
++			#include <sys/time.h>
+ 			int main () { 
+ 			pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+ 			pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+@@ -839,6 +840,7 @@
+ 			gettimeofday (&tval, NULL);
+ 			tspec.tv_sec = tval.tv_sec;
+ 			tspec.tv_nsec = 0;
++			pthread_mutex_lock (&mutex);
+ 			return pthread_cond_timedwait (&cond,&mutex,&tspec) 
+ 				!= -1;}],
+ 			[AC_MSG_RESULT(no)],