diff options
Diffstat (limited to 'net/miredo/patches/patch-ad')
| -rw-r--r-- | net/miredo/patches/patch-ad | 70 |
1 files changed, 29 insertions, 41 deletions
diff --git a/net/miredo/patches/patch-ad b/net/miredo/patches/patch-ad index f7ffc136732..59421feff77 100644 --- a/net/miredo/patches/patch-ad +++ b/net/miredo/patches/patch-ad @@ -1,44 +1,32 @@ -$NetBSD: patch-ad,v 1.1 2006/03/14 01:59:19 joerg Exp $ +$NetBSD: patch-ad,v 1.1.2.1 2006/06/07 18:23:42 ghen Exp $ ---- configure.orig 2006-02-02 21:02:16.000000000 +0000 -+++ configure -@@ -20613,6 +20613,12 @@ _ACEOF - _ACEOF +--- compat/barrier.c.orig 2006-05-01 12:57:31.000000000 +0000 ++++ compat/barrier.c +@@ -30,7 +30,27 @@ + ***********************************************************************/ - ;; -+ *dragonfly*) -+ cat >>confdefs.h <<\_ACEOF -+#define HAVE_DRAGONFLY 1 -+_ACEOF + #include <errno.h> + -+ ;; - *openbsd*) - cat >>confdefs.h <<\_ACEOF - #define HAVE_OPENBSD 1 -@@ -21878,8 +21884,7 @@ fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$ac_cv_search_pthread_create" = no; then -- for ac_lib in pthread c_r; do -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -21923,7 +21928,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_search_pthread_create="-l$ac_lib" -+ ac_cv_search_pthread_create="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" - break - else - echo "$as_me: failed program was:" >&5 -@@ -21932,7 +21937,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- done - fi - LIBS=$ac_func_search_save_LIBS - fi ++#if defined(__DragonFly__) ++#define pthread_barrier_init sys_pthread_barrier_init ++#define pthread_barrier_destroy sys_pthread_barrier_destroy ++#define pthread_barrier_wait sys_pthread_barrier_wait ++#define pthread_barrier_t sys_pthread_barrier_t ++#define pthread_barrierattr_init sys_pthread_barrierattr_init ++#define pthread_barrierattr_destroy sys_pthread_barrierattr_destroy ++#define pthread_barrierattr_t sys_pthread_barrierattr_t ++#endif + #include <pthread.h> ++#if defined(__DragonFly__) ++#undef pthread_barrier_init ++#undef pthread_barrier_destroy ++#undef pthread_barrier_wait ++#undef pthread_barrier_t ++#undef pthread_barrierattr_init ++#undef pthread_barrierattr_destroy ++#undef pthread_barrierattr_t ++#undef PTHREAD_BARRIER_SERIAL_THREAD ++#endif + #include "barrier.h" + + extern int |