diff options
| author | joerg <joerg> | 2006-01-09 13:13:52 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-01-09 13:13:52 +0000 |
| commit | c6c4ce39c6614b75442c15cb62aa97e55f70cdd8 (patch) | |
| tree | 5ccef41d432486dcf276b78b59c8804f89d13261 /x11/openmotif | |
| parent | 30d900efa873092007a9289c52bf04780c78fa67 (diff) | |
| download | pkgsrc-c6c4ce39c6614b75442c15cb62aa97e55f70cdd8.tar.gz | |
Fix build on NetBSD systems:
If we have NetBSD 2.99.10 and higher, getpwuid_r and friends exist,
but _PTHREAD_THREAD_SAFE_FUNCTIONS might not be defined. Define it.
For NetBSD before 2.99.10, explicitly set XNO_MTSAFE_PWDAPI to enforce
locked access via normal functions.
Diffstat (limited to 'x11/openmotif')
| -rw-r--r-- | x11/openmotif/distinfo | 6 | ||||
| -rw-r--r-- | x11/openmotif/patches/patch-ac | 15 | ||||
| -rw-r--r-- | x11/openmotif/patches/patch-ae | 16 |
3 files changed, 26 insertions, 11 deletions
diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo index 6c67b2b0310..d9056b3a389 100644 --- a/x11/openmotif/distinfo +++ b/x11/openmotif/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.22 2006/01/07 21:08:12 joerg Exp $ +$NetBSD: distinfo,v 1.23 2006/01/09 13:13:52 joerg Exp $ SHA1 (openMotif-2.2.3.tar.gz) = c463653d9f8e24b35522c3ba6363ddf7a282eab4 RMD160 (openMotif-2.2.3.tar.gz) = b99230d508da57bca72b6920d28fce4187bf5179 Size (openMotif-2.2.3.tar.gz) = 5149785 bytes SHA1 (patch-aa) = 5c204036a831ca890b196c6f7d23be2fdb848980 SHA1 (patch-ab) = 2243e335412b124e1ac57f57d25b5afdeacd987c -SHA1 (patch-ac) = 77bfe5771dbcd942fcf5c73a1fa3e55154c9f03d +SHA1 (patch-ac) = 1c14d22f888859b15365bcba7edba78a1114c6ac SHA1 (patch-ad) = 4903cbf3b9ac6e2dd2f8e327bb33f5743650787e -SHA1 (patch-ae) = 47db1a43eda588f8502a33a46f1eaf7a72449812 +SHA1 (patch-ae) = 00ffe019ea7a6950ed673f5a7907196b22a45f4e SHA1 (patch-af) = 5ea54810105cfb2fc9d4a828e32208318e3c5d42 SHA1 (patch-ag) = c7e461c35ef4bdbcc8917917a34ab546760cb5cc SHA1 (patch-ah) = d94132709d6b69d437a37616834bda8cc42592ba diff --git a/x11/openmotif/patches/patch-ac b/x11/openmotif/patches/patch-ac index b8bbcc4a646..1f64cab5ec4 100644 --- a/x11/openmotif/patches/patch-ac +++ b/x11/openmotif/patches/patch-ac @@ -1,13 +1,20 @@ -$NetBSD: patch-ac,v 1.5 2006/01/04 15:53:15 joerg Exp $ +$NetBSD: patch-ac,v 1.6 2006/01/09 13:13:53 joerg Exp $ --- lib/Xm/Xmos.c.orig 2005-11-25 05:50:57.000000000 +0100 +++ lib/Xm/Xmos.c -@@ -91,6 +91,10 @@ extern int regex(); +@@ -91,6 +91,17 @@ extern int regex(); #include <sys/stat.h> -+#if defined(__NetBSD__) && __NetBSD_Version__ >= 299001000 && !defined(_POSIX_THREAD_SAFE_FUNCTIONS) /* NetBSD 2.99.10 */ -+#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L ++#if defined(__NetBSD__) ++#include <sys/param.h> ++# if __NetBSD_Version__ >= 299001000 /* NetBSD 2.99.10 has getpw*_r*/ ++# if !defined(_POSIX_THREAD_SAFE_FUNCTIONS) ++# define _POSIX_THREAD_SAFE_FUNCTIONS 200112L ++# endif ++# else ++# define XNO_MTSAFE_PWDAPI ++# endif +#endif + #define X_INCLUDE_PWD_H diff --git a/x11/openmotif/patches/patch-ae b/x11/openmotif/patches/patch-ae index 7d84ea2eb07..b761a67c2fd 100644 --- a/x11/openmotif/patches/patch-ae +++ b/x11/openmotif/patches/patch-ae @@ -1,16 +1,24 @@ -$NetBSD: patch-ae,v 1.3 2005/12/12 19:55:41 joerg Exp $ +$NetBSD: patch-ae,v 1.4 2006/01/09 13:13:53 joerg Exp $ --- clients/uil/UilDB.c.orig 2005-11-25 10:43:27.000000000 +0100 +++ clients/uil/UilDB.c -@@ -79,8 +79,9 @@ static char rcsid[] = "$XConsortium: Uil +@@ -79,8 +79,17 @@ static char rcsid[] = "$XConsortium: Uil #include <unistd.h> #endif - - -+#if defined(__NetBSD__) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS) -+#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L ++#if defined(__NetBSD__) ++#include <sys/param.h> ++# if __NetBSD_Version__ >= 299001000 /* NetBSD 2.99.10 has getpw*_r*/ ++# if !defined(_POSIX_THREAD_SAFE_FUNCTIONS) ++# define _POSIX_THREAD_SAFE_FUNCTIONS 200112L ++# endif ++# else ++# define XNO_MTSAFE_PWDAPI ++# endif +#endif ++ #include "UilDefI.h" |