0487aad739
Also fixes the usual gcc4 suspects. (static/extern storage class mismatch)
118 lines
3.9 KiB
Text
118 lines
3.9 KiB
Text
$NetBSD: patch-ag,v 1.2 2008/01/23 04:59:35 tnn Exp $
|
|
|
|
--- configure.orig 2004-05-02 20:53:17.000000000 +0000
|
|
+++ configure
|
|
@@ -4034,13 +4034,13 @@ 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 )
|
|
# Not sure whether the presence of OpenBSD here was a mistake.
|
|
# Let's accept both of them until this is cleared up.
|
|
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
|
|
+ lt_cv_deplibs_check_method='file_magic (DragonFly|FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
|
|
lt_cv_file_magic_cmd=/usr/bin/file
|
|
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
|
;;
|
|
@@ -7704,7 +7704,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 $libobjs $deplibs $compiler_flags'
|
|
hardcode_libdir_flag_spec='-R$libdir'
|
|
hardcode_direct=yes
|
|
@@ -8282,7 +8282,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
|
|
@@ -10653,7 +10653,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
|
|
@@ -11360,7 +11360,7 @@ echo $ECHO_N "checking for $compiler opt
|
|
;;
|
|
esac
|
|
;;
|
|
- freebsd* | kfreebsd*-gnu)
|
|
+ freebsd* | kfreebsd*-gnu | dragonfly*)
|
|
# FreeBSD uses GNU C++
|
|
;;
|
|
hpux9* | hpux10* | hpux11*)
|
|
@@ -11974,7 +11974,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
|
|
@@ -14537,7 +14537,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 $libobjs $deplibs $compiler_flags'
|
|
hardcode_libdir_flag_spec_F77='-R$libdir'
|
|
hardcode_direct_F77=yes
|
|
@@ -15115,7 +15115,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
|
|
@@ -16883,7 +16883,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 $libobjs $deplibs $compiler_flags'
|
|
hardcode_libdir_flag_spec_GCJ='-R$libdir'
|
|
hardcode_direct_GCJ=yes
|
|
@@ -17461,7 +17461,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
|
|
@@ -22733,7 +22733,7 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
int
|
|
main ()
|
|
{
|
|
-void *(*foo)(size_t) = alloca;
|
|
+void *foo = alloca(sizeof(void));
|
|
;
|
|
return 0;
|
|
}
|
|
@@ -32305,6 +32305,7 @@ fi
|
|
|
|
if test "x$BUILD_SW" = xyes; then
|
|
VID_REND_NOINST_TARGETS="$VID_REND_NOINST_TARGETS libQFrenderer_sw.la"
|
|
+ VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la"
|
|
VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw.la"
|
|
fi
|
|
if test "x$BUILD_SW32" = xyes; then
|