diff options
| author | jschauma <jschauma> | 2004-04-12 20:18:07 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2004-04-12 20:18:07 +0000 |
| commit | 7941a69a463c4e10ea05eee63126339a27e38866 (patch) | |
| tree | bfba61c8771b0997a8e3d4c95fca03677b1da806 | |
| parent | 612c1cd238e0fa1b29b669e9c21d852b356bacf6 (diff) | |
| download | pkgsrc-7941a69a463c4e10ea05eee63126339a27e38866.tar.gz | |
Make this build under IRIX by only applying this patch on non-irix.
(Is this patch really needed on all other platforms?)
| -rw-r--r-- | devel/glib/distinfo | 4 | ||||
| -rw-r--r-- | devel/glib/patches/patch-ai | 22 |
2 files changed, 18 insertions, 8 deletions
diff --git a/devel/glib/distinfo b/devel/glib/distinfo index 13c562962b6..9a10845cefe 100644 --- a/devel/glib/distinfo +++ b/devel/glib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2004/02/08 23:22:45 mjl Exp $ +$NetBSD: distinfo,v 1.11 2004/04/12 20:18:07 jschauma Exp $ SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa Size (glib-1.2.10.tar.gz) = 421480 bytes @@ -9,4 +9,4 @@ SHA1 (patch-ad) = a7c10916ccaef52a62415d129060a6dddbc5fbd8 SHA1 (patch-ae) = 222a1f4c470fd1123deb3b4dd918b036b3607e59 SHA1 (patch-af) = 8fa1db64eb7a44e83e9e2ad483b12cf9fe50341e SHA1 (patch-ag) = efdff0d20a1c3280c9916405a8d89190c68b9604 -SHA1 (patch-ai) = 8c81ff9ed494a00663ce92afc889050a4eb37218 +SHA1 (patch-ai) = 6f6e5727bcb52655865b689c923601843d8d453d diff --git a/devel/glib/patches/patch-ai b/devel/glib/patches/patch-ai index dfbd421cc8d..206905afc15 100644 --- a/devel/glib/patches/patch-ai +++ b/devel/glib/patches/patch-ai @@ -1,17 +1,27 @@ -$NetBSD: patch-ai,v 1.3 2002/08/25 18:38:30 jlam Exp $ +$NetBSD: patch-ai,v 1.4 2004/04/12 20:18:07 jschauma Exp $ ---- gthread/testgthread.c.orig Fri Jul 19 03:43:50 2002 -+++ gthread/testgthread.c Fri Jul 19 03:42:15 2002 -@@ -87,10 +87,10 @@ +--- gthread/testgthread.c.orig Mon Apr 12 14:24:40 2004 ++++ gthread/testgthread.c Mon Apr 12 14:25:44 2004 +@@ -87,10 +87,22 @@ pthread_attr_setdetachstate (&pthread_attr, PTHREAD_CREATE_JOINABLE); */ pthread_create (&thread, &pthread_attr, (void *(*)(void *)) func, data); -- return GUINT_TO_POINTER (thread); ++ ++#ifdef __sgi + return GUINT_TO_POINTER (thread); ++#else + return thread; ++#endif } ++ ++#ifdef __sgi #define join_thread(thread) \ -- pthread_join ((pthread_t)GPOINTER_TO_UINT (thread), NULL) + pthread_join ((pthread_t)GPOINTER_TO_UINT (thread), NULL) ++#else ++#define join_thread(thread) \ + pthread_join ((thread), NULL) ++#endif ++ #define self_thread() GUINT_TO_POINTER (pthread_self ()) #else /* we are not having a thread implementation, do nothing */ |