95 lines
2.6 KiB
Plaintext
95 lines
2.6 KiB
Plaintext
$NetBSD: patch-ab,v 1.24 2014/03/17 19:07:36 asau Exp $
|
|
|
|
--- dist/configure.orig 2010-04-12 20:25:23.000000000 +0000
|
|
+++ dist/configure
|
|
@@ -4523,7 +4523,7 @@ bsdi3*) CC=${CC-"shlicc2"}
|
|
LIBSO_LIBS="$LIBSO_LIBS -lipc";;
|
|
cygwin*)
|
|
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
|
|
-freebsd*)
|
|
+freebsd*|dragonfly*)
|
|
CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
|
|
LDFLAGS="$LDFLAGS -pthread";;
|
|
gnu*|k*bsd*-gnu|linux*)
|
|
@@ -6282,7 +6282,7 @@ fi
|
|
# we're using.
|
|
case "$host_os" in
|
|
sysv5UnixWare*|sysv5OpenUNIX8*)
|
|
- if test "$GCC" == "yes"; then
|
|
+ if test "$GCC" = "yes"; then
|
|
CPPFLAGS="$CPPFLAGS -pthread"
|
|
LDFLAGS="$LDFLAGS -pthread"
|
|
else
|
|
@@ -11202,7 +11202,7 @@ if test -z "$aix_libpath"; then aix_libp
|
|
hardcode_shlibpath_var=no
|
|
;;
|
|
|
|
- freebsd1*)
|
|
+ freebsd1|freebsd1.*)
|
|
ld_shlibs=no
|
|
;;
|
|
|
|
@@ -12077,7 +12077,7 @@ dgux*)
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
;;
|
|
|
|
-freebsd1*)
|
|
+freebsd1|freebsd1.*)
|
|
dynamic_linker=no
|
|
;;
|
|
|
|
@@ -12088,7 +12088,7 @@ freebsd* | dragonfly*)
|
|
objformat=`/usr/bin/objformat`
|
|
else
|
|
case $host_os in
|
|
- freebsd[123]*) objformat=aout ;;
|
|
+ freebsd[123].freebsd[123].*) objformat=aout ;;
|
|
*) objformat=elf ;;
|
|
esac
|
|
fi
|
|
@@ -13772,7 +13772,7 @@ if test -z "$aix_libpath"; then aix_libp
|
|
esac
|
|
;;
|
|
|
|
- freebsd[12]*)
|
|
+ freebsd[12]|freebsd[12].*)
|
|
# C++ shared libraries reported to be fairly broken before
|
|
# switch to ELF
|
|
ld_shlibs_CXX=no
|
|
@@ -15530,7 +15530,7 @@ dgux*)
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
;;
|
|
|
|
-freebsd1*)
|
|
+freebsd1|freebsd1.*)
|
|
dynamic_linker=no
|
|
;;
|
|
|
|
@@ -15541,7 +15541,7 @@ freebsd* | dragonfly*)
|
|
objformat=`/usr/bin/objformat`
|
|
else
|
|
case $host_os in
|
|
- freebsd[123]*) objformat=aout ;;
|
|
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
|
|
*) objformat=elf ;;
|
|
esac
|
|
fi
|
|
@@ -16161,7 +16161,7 @@ LIBTOOL="./libtool"
|
|
INSTALLER="\$(LIBTOOL) --mode=install cp -p"
|
|
|
|
MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
|
|
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
|
|
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
|
|
MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
|
|
MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
|
|
MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
|
|
@@ -16890,7 +16890,7 @@ if test "$_JTOPDIR" != "/usr"; then
|
|
aix*) _JNI_INC_SUBDIRS="aix";;
|
|
bsdi*) _JNI_INC_SUBDIRS="bsdos";;
|
|
cygwin*) _JNI_INC_SUBDIRS="win32";;
|
|
- freebsd*) _JNI_INC_SUBDIRS="freebsd";;
|
|
+ freebsd*|dragonfly*) _JNI_INC_SUBDIRS="freebsd";;
|
|
hp*) _JNI_INC_SUBDIRS="hp-ux";;
|
|
linux*) _JNI_INC_SUBDIRS="linux genunix";;
|
|
osf*) _JNI_INC_SUBDIRS="alpha";;
|