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 00c9f807db29ba5e79ef494cd54e42a61e84b171..2617fe91307fe1f914c832c7ce855c21184f7d25 100644 (file)
--- 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 (file)
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)],