150 lines
5.1 KiB
Text
150 lines
5.1 KiB
Text
$NetBSD: patch-ae,v 1.13 2013/11/04 09:38:26 jperkin Exp $
|
|
|
|
Support DragonFlyBSD
|
|
Support arpa/nameser_compat.h for OSX
|
|
|
|
--- configure.orig 2008-08-20 16:06:05.000000000 +0000
|
|
+++ configure
|
|
@@ -8315,7 +8315,7 @@ darwin* | rhapsody*)
|
|
lt_cv_deplibs_check_method=pass_all
|
|
;;
|
|
|
|
-freebsd* | kfreebsd*-gnu)
|
|
+freebsd* | kfreebsd*-gnu | dragonfly*)
|
|
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
|
case $host_cpu in
|
|
i*86 )
|
|
@@ -11114,7 +11114,7 @@ if test -z "$aix_libpath"; then aix_libp
|
|
;;
|
|
|
|
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
|
- freebsd* | kfreebsd*-gnu)
|
|
+ freebsd* | kfreebsd*-gnu | dragonfly*)
|
|
archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
|
|
hardcode_libdir_flag_spec='-R$libdir'
|
|
hardcode_direct=yes
|
|
@@ -11679,7 +11679,7 @@ kfreebsd*-gnu*)
|
|
dynamic_linker='GNU ld.so'
|
|
;;
|
|
|
|
-freebsd*)
|
|
+freebsd* | dragonfly*)
|
|
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
version_type=freebsd-$objformat
|
|
case $version_type in
|
|
@@ -13995,7 +13995,7 @@ if test -z "$aix_libpath"; then aix_libp
|
|
freebsd-elf*)
|
|
archive_cmds_need_lc_CXX=no
|
|
;;
|
|
- freebsd* | kfreebsd*-gnu)
|
|
+ freebsd* | kfreebsd*-gnu | dragonfly*)
|
|
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
|
|
# conventions
|
|
ld_shlibs_CXX=yes
|
|
@@ -14706,7 +14706,7 @@ echo $ECHO_N "checking for $compiler opt
|
|
;;
|
|
esac
|
|
;;
|
|
- freebsd* | kfreebsd*-gnu)
|
|
+ freebsd* | kfreebsd*-gnu | dragonfly*)
|
|
# FreeBSD uses GNU C++
|
|
;;
|
|
hpux9* | hpux10* | hpux11*)
|
|
@@ -15308,7 +15308,7 @@ kfreebsd*-gnu*)
|
|
dynamic_linker='GNU ld.so'
|
|
;;
|
|
|
|
-freebsd*)
|
|
+freebsd* | dragonfly*)
|
|
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
version_type=freebsd-$objformat
|
|
case $version_type in
|
|
@@ -17797,7 +17797,7 @@ if test -z "$aix_libpath"; then aix_libp
|
|
;;
|
|
|
|
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
|
- freebsd* | kfreebsd*-gnu)
|
|
+ freebsd* | kfreebsd*-gnu | dragonfly*)
|
|
archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
|
|
hardcode_libdir_flag_spec_F77='-R$libdir'
|
|
hardcode_direct_F77=yes
|
|
@@ -18362,7 +18362,7 @@ kfreebsd*-gnu*)
|
|
dynamic_linker='GNU ld.so'
|
|
;;
|
|
|
|
-freebsd*)
|
|
+freebsd* | dragonfly*)
|
|
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
version_type=freebsd-$objformat
|
|
case $version_type in
|
|
@@ -20085,7 +20085,7 @@ if test -z "$aix_libpath"; then aix_libp
|
|
;;
|
|
|
|
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
|
- freebsd* | kfreebsd*-gnu)
|
|
+ freebsd* | kfreebsd*-gnu | dragonfly*)
|
|
archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
|
|
hardcode_libdir_flag_spec_GCJ='-R$libdir'
|
|
hardcode_direct_GCJ=yes
|
|
@@ -20650,7 +20650,7 @@ kfreebsd*-gnu*)
|
|
dynamic_linker='GNU ld.so'
|
|
;;
|
|
|
|
-freebsd*)
|
|
+freebsd* | dragonfly*)
|
|
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
version_type=freebsd-$objformat
|
|
case $version_type in
|
|
@@ -45355,7 +45355,7 @@ echo "$as_me: error: Fast malloc is not
|
|
esac
|
|
case $target_os in
|
|
linux*) ;;
|
|
- freebsd*) ;;
|
|
+ freebsd*|dragonfly*) ;;
|
|
*)
|
|
if test "$kde_fast_malloc" = "notgiven"; then
|
|
kde_fast_malloc=no
|
|
@@ -49056,6 +49056,7 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++}
|
|
kde_save_CXXFLAGS="$CXXFLAGS"
|
|
EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
|
|
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
|
|
+ CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
|
|
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
@@ -50834,7 +50835,7 @@ fi
|
|
|
|
|
|
|
|
-for ac_header in arpa/nameser8_compat.h sys/param.h
|
|
+for ac_header in arpa/nameser_compat.h arpa/nameser8_compat.h sys/param.h
|
|
do
|
|
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
@@ -51215,7 +51216,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
|
|
gssapi_flavor=HEIMDAL
|
|
fi
|
|
else
|
|
- search_incs="$kde_includes /usr/include /usr/local/include"
|
|
+ search_incs="$kde_includes /usr/include/gssapi /usr/include /usr/local/include"
|
|
|
|
gssapi_incdir=NO
|
|
for i in $search_incs;
|
|
@@ -51258,7 +51259,7 @@ done
|
|
GSSAPI_LIBS="-L$gssapi_libdir "
|
|
test "$USE_RPATH" = yes && GSSAPI_RPATH="-R $gssapi_libdir"
|
|
fi
|
|
- GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt ${LIBRESOLV}"
|
|
+ GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcom_err -lcrypt ${LIBRESOLV}"
|
|
with_gssapi=FOUND
|
|
gssapi_flavor=HEIMDAL
|
|
break
|
|
@@ -51302,7 +51303,7 @@ echo "${ECHO_T}searched but not found" >
|
|
GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIBRESOLV}"
|
|
else
|
|
gssapi_flavor=HEIMDAL
|
|
- GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt ${LIBRESOLV}"
|
|
+ GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcom_err -lcrypt ${LIBRESOLV}"
|
|
fi
|
|
fi
|
|
if test "x$gssapi_flavor" = "xMIT" ; then
|