diff options
Diffstat (limited to 'net/bind9/patches/patch-ad')
| -rw-r--r-- | net/bind9/patches/patch-ad | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/net/bind9/patches/patch-ad b/net/bind9/patches/patch-ad index 8e182a139e0..f645594f316 100644 --- a/net/bind9/patches/patch-ad +++ b/net/bind9/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.6 2006/08/17 14:14:18 taca Exp $ +$NetBSD: patch-ad,v 1.6.14.1 2008/07/11 06:14:07 ghen Exp $ ---- configure.orig 2005-10-21 08:57:38.000000000 +0900 +--- configure.orig 2007-09-14 05:27:29.000000000 +0100 +++ configure -@@ -5546,6 +5546,8 @@ case $host in +@@ -6165,6 +6165,8 @@ case $host in use_threads=false ;; *-freebsd*) use_threads=false ;; @@ -11,37 +11,35 @@ $NetBSD: patch-ad,v 1.6 2006/08/17 14:14:18 taca Exp $ *-bsdi234*) # Thread signals do not work reliably on some versions of BSD/OS. use_threads=false ;; -@@ -5634,7 +5636,7 @@ echo "$as_me: WARNING: linking with PTL2 - echo "${ECHO_T}native" >&6 +@@ -6253,7 +6255,7 @@ echo "$as_me: WARNING: linking with PTL2 + echo "${ECHO_T}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 -@@ -5645,14 +5647,23 @@ echo "$as_me: error: \"could not find th + { echo "$as_me:$LINENO: result: none" >&5 + echo "${ECHO_T}none" >&6; } +@@ -6264,14 +6266,23 @@ echo "$as_me: error: \"could not find th if $use_threads then -- 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" + if test -f /usr/include/pthread.h + then + { echo "$as_me:$LINENO: result: native pthreads" >&5 +echo "${ECHO_T}native pthreads" >&6; } + LIBS="-lpthread $LIBS" -+ CPPFLAGS="$CPPFLAGS -I/usr/inclue" ++ 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; } + { 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" + pkg="$LOCALBASE/pthreads" + lib1="-L$pkg/lib -Wl,-R$pkg/lib" + lib2="-lpthread -lm -lgcc -lpthread" |