95 lines
2.9 KiB
Text
95 lines
2.9 KiB
Text
$NetBSD: patch-ai,v 1.9 2008/06/21 22:13:22 adrianp Exp $
|
|
|
|
--- lib/bind/configure.orig 2005-10-14 10:44:50.000000000 +0900
|
|
+++ lib/bind/configure
|
|
@@ -1960,12 +1960,7 @@ done
|
|
#
|
|
case "$includedir" in
|
|
'${prefix}/include')
|
|
- includedir='${prefix}/bind/include'
|
|
- ;;
|
|
-esac
|
|
-case "$libdir" in
|
|
- '${prefix}/lib')
|
|
- libdir='${prefix}/bind/lib'
|
|
+ includedir='${prefix}/include/bind'
|
|
;;
|
|
esac
|
|
|
|
@@ -4547,6 +4542,8 @@ case $host in
|
|
use_threads=false ;;
|
|
*-freebsd*)
|
|
use_threads=false ;;
|
|
+*-dragonfly*)
|
|
+ use_threads=false ;;
|
|
*-bsdi234*)
|
|
# Thread signals do not work reliably on some versions of BSD/OS.
|
|
use_threads=false ;;
|
|
@@ -4635,7 +4632,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
|
|
@@ -4646,14 +4643,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/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"
|
|
+ fi
|
|
fi
|
|
fi
|
|
fi
|
|
@@ -5714,6 +5720,10 @@ fi
|
|
CCOPT="$CCOPT -pthread"
|
|
STD_CDEFINES="$STD_CDEFINES -D_THREAD_SAFE"
|
|
;;
|
|
+ *-dragonfly*)
|
|
+ CC="$CC -pthread"
|
|
+ CCOPT="$CCOPT -pthread"
|
|
+ ;;
|
|
*-openbsd*)
|
|
CC="$CC -pthread"
|
|
CCOPT="$CCOPT -pthread"
|
|
@@ -23291,6 +23301,7 @@ case "$host" in
|
|
*-bsdi2345*) have_minimum_ifreq=yes;;
|
|
*-darwin*) have_minimum_ifreq=yes;;
|
|
*-freebsd*) have_minimum_ifreq=yes;;
|
|
+ *-dragonfly*) have_minimum_ifreq=yes;;
|
|
*-lynxos*) have_minimum_ifreq=yes;;
|
|
*-netbsd*) have_minimum_ifreq=yes;;
|
|
*-next*) have_minimum_ifreq=yes;;
|
|
@@ -23330,6 +23341,7 @@ case "$host" in
|
|
*-darwin*) PORT_DIR="port/darwin";;
|
|
*-osf*) PORT_DIR="port/decunix";;
|
|
*-freebsd*) PORT_DIR="port/freebsd";;
|
|
+ *-dragonfly*) PORT_DIR="port/freebsd";;
|
|
*-hpux9*) PORT_DIR="port/hpux9";;
|
|
*-hpux10*) PORT_DIR="port/hpux10";;
|
|
*-hpux11*) PORT_DIR="port/hpux";;
|