diff options
Diffstat (limited to 'net/bind97/patches/patch-ac')
| -rw-r--r-- | net/bind97/patches/patch-ac | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/net/bind97/patches/patch-ac b/net/bind97/patches/patch-ac index 78618e956d4..570433fa01f 100644 --- a/net/bind97/patches/patch-ac +++ b/net/bind97/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2010/05/26 16:11:47 taca Exp $ +$NetBSD: patch-ac,v 1.2 2010/07/05 03:17:45 taca Exp $ ---- configure.orig 2009-11-11 08:47:27.000000000 +0000 +--- configure.orig 2010-05-26 23:47:44.000000000 +0000 +++ configure -@@ -23552,6 +23552,8 @@ case $host in +@@ -24293,6 +24293,8 @@ case $host in use_threads=false ;; *-freebsd*) use_threads=false ;; @@ -11,36 +11,35 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/05/26 16:11:47 taca Exp $ *-bsdi234*) # Thread signals do not work reliably on some versions of BSD/OS. use_threads=false ;; -@@ -23640,7 +23642,7 @@ echo "$as_me: WARNING: linking with PTL2 - echo "${ECHO_T}native" >&6; } +@@ -24381,7 +24383,7 @@ $as_echo "$as_me: WARNING: linking with + $as_echo "native" >&6; } LIBS="-lpthread $LIBS" else - if test ! -d $LOCALBASE/pthreads + if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h then - { echo "$as_me:$LINENO: result: none" >&5 - echo "${ECHO_T}none" >&6; } -@@ -23651,14 +23653,23 @@ echo "$as_me: error: \"could not find th - - if $use_threads + { $as_echo "$as_me:$LINENO: result: none" >&5 + $as_echo "none" >&6; } +@@ -24394,12 +24396,23 @@ $as_echo "$as_me: error: \"could not fin then -- { echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5 + { $as_echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5 + $as_echo "mit-pthreads/unproven-pthreads" >&6; } +- pkg="$LOCALBASE/pthreads" +- lib1="-L$pkg/lib -Wl,-R$pkg/lib" +- lib2="-lpthread -lm -lgcc -lpthread" +- LIBS="$lib1 $lib2 $LIBS" +- CPPFLAGS="$CPPFLAGS -I$pkg/include" +- STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include" + if test -f /usr/include/pthread.h + then -+ { echo "$as_me:$LINENO: result: native pthreads" >&5 ++ { $as_echo "$as_me:$LINENO: result: native pthreads" >&5 +$as_echo "native pthreads" >&6; } + LIBS="-lpthread $LIBS" + CPPFLAGS="$CPPFLAGS -I/usr/include" + STD_CINDLUES="$STD_CINDLUES -I/usr/include" + else -+ { echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5 - echo "${ECHO_T}mit-pthreads/unproven-pthreads" >&6; } -- pkg="$LOCALBASE/pthreads" -- lib1="-L$pkg/lib -Wl,-R$pkg/lib" -- lib2="-lpthread -lm -lgcc -lpthread" -- LIBS="$lib1 $lib2 $LIBS" -- CPPFLAGS="$CPPFLAGS -I$pkg/include" -- STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include" ++ { $as_echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5 ++$as_echo "mit-pthreads/unproven-pthreads" >&6; } + pkg="$LOCALBASE/pthreads" + lib1="-L$pkg/lib -Wl,-R$pkg/lib" + lib2="-lpthread -lm -lgcc -lpthread" @@ -51,7 +50,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/05/26 16:11:47 taca Exp $ fi fi fi -@@ -26076,9 +26087,9 @@ case $use_libtool in +@@ -26918,9 +26931,9 @@ case $use_libtool in O=lo A=la LIBTOOL_MKDEP_SED='s;\.o;\.lo;' @@ -63,7 +62,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/05/26 16:11:47 taca Exp $ case "$host" in *) LIBTOOL_ALLOW_UNDEFINED= ;; esac -@@ -32891,7 +32902,7 @@ echo "${ECHO_T}no" >&6; } +@@ -33936,7 +33949,7 @@ $as_echo "no" >&6; } fi if test -n "-L$use_dlz_postgres_lib -lpq" then |