| @@ -1,75 +1,87 @@ | | | @@ -1,75 +1,87 @@ |
1 | $NetBSD: patch-ab,v 1.4 2005/12/21 17:56:10 joerg Exp $ | | 1 | $NetBSD: patch-ab,v 1.5 2012/07/03 17:42:48 joerg Exp $ |
2 | | | 2 | |
3 | --- configure.orig | | 3 | --- configure.orig 2003-12-17 03:15:18.000000000 +0000 |
4 | +++ configure | | 4 | +++ configure |
5 | @@ -1318,7 +1318,7 @@ | | 5 | @@ -1331,7 +1331,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
6 | LIBS="$LIBS -lm" | | 6 | LIBS="$LIBS -lm" |
7 | f77_compile='${F77-f77} $FFLAGS -c conftest.f 1>&5 2>&5' | | 7 | f77_compile='${F77-f77} $FFLAGS -c conftest.f 1>&5 2>&5' |
8 | f77_make='make F77="${F77-f77}" FFLAGS="$FFLAGS" -f conftest.mak conftest.o 1>&5 2>&5' | | 8 | f77_make='make F77="${F77-f77}" FFLAGS="$FFLAGS" -f conftest.mak conftest.o 1>&5 2>&5' |
9 | -c_f77_link='(${F77-f77} $FFLAGS -c conftestf.f && ${CC-cc} $CFLAGS $CPPFLAGS conftest.c conftestf.o -o conftest $LDFLAGS $LIBS) 1>&5 2>&5' | | 9 | -c_f77_link='(${F77-f77} $FFLAGS -c conftestf.f && ${CC-cc} $CFLAGS $CPPFLAGS conftest.c conftestf.o -o conftest $LDFLAGS $LIBS) 1>&5 2>&5' |
10 | +c_f77_link='(${F77-f77} $FFLAGS -c conftestf.f && ${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c && ${F77-f77} conftest.o conftestf.o -o conftest $LDFLAGS $LIBS) 1>&5 2>&5' | | 10 | +c_f77_link='(${F77-f77} $FFLAGS -c conftestf.f && ${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c && ${F77-f77} conftest.o conftestf.o -o conftest $LDFLAGS $LIBS) 1>&5 2>&5' |
11 | | | 11 | |
12 | # The next two don't include LDFLAGS, because some loser f77 compilers | | 12 | # The next two don't include LDFLAGS, because some loser f77 compilers |
13 | # (like on hp) do their own thing with the -L option. | | 13 | # (like on hp) do their own thing with the -L option. |
14 | @@ -4378,60 +4378,12 @@ | | 14 | @@ -2561,9 +2561,9 @@ echo $ECHO_N "checking for support of AN |
| | | 15 | cat > conftest.$ac_ext <<EOF |
| | | 16 | #line 2562 "configure" |
| | | 17 | #include "confdefs.h" |
| | | 18 | -int main(int argc, char *argv); |
| | | 19 | +int main(int argc, char **argv); |
| | | 20 | int t(void); |
| | | 21 | -int main(int argc, char *argv) { return t(); } |
| | | 22 | +int main(int argc, char **argv) { return t(); } |
| | | 23 | int t(void) { return 0; } |
| | | 24 | EOF |
| | | 25 | if eval $ac_compile; then |
| | | 26 | @@ -4435,60 +4435,12 @@ echo "${ECHO_T}\"T\" becomes \"$f77_sym\ |
15 | | | 27 | |
16 | | | 28 | |
17 | #--------------------------------------------------------------------- | | 29 | #--------------------------------------------------------------------- |
18 | -# Where would we expect to find the Fortran libraries? | | 30 | -# Where would we expect to find the Fortran libraries? |
19 | -#--------------------------------------------------------------------- | | 31 | -#--------------------------------------------------------------------- |
20 | - | | 32 | - |
21 | - | | 33 | - |
22 | -# Check whether --with-fortran-libs or --without-fortran-libs was given. | | 34 | -# Check whether --with-fortran-libs or --without-fortran-libs was given. |
23 | -if test "${with_fortran_libs+set}" = set; then | | 35 | -if test "${with_fortran_libs+set}" = set; then |
24 | - withval="$with_fortran_libs" | | 36 | - withval="$with_fortran_libs" |
25 | - fortran_libs="${withval}" | | 37 | - fortran_libs="${withval}" |
26 | -else | | 38 | -else |
27 | - # The patterns are not necessarily exclusive, so their order is important. | | 39 | - # The patterns are not necessarily exclusive, so their order is important. |
28 | - case "$host" in | | 40 | - case "$host" in |
29 | - sparc-sun-sunos4* ) | | 41 | - sparc-sun-sunos4* ) |
30 | - fortran_libs="/usr/lang/SC1.0" ;; | | 42 | - fortran_libs="/usr/lang/SC1.0" ;; |
31 | - sparc-sun-solaris2* ) | | 43 | - sparc-sun-solaris2* ) |
32 | - fortran_libs=`/bin/ls -d /opt/SUNWspro/SC* | head -1`/lib ;; | | 44 | - fortran_libs=`/bin/ls -d /opt/SUNWspro/SC* | head -1`/lib ;; |
33 | - alpha*-*-osf* ) | | 45 | - alpha*-*-osf* ) |
34 | - fortran_libs="/usr/lib" ;; | | 46 | - fortran_libs="/usr/lib" ;; |
35 | - *-hp-hpux1* ) | | 47 | - *-hp-hpux1* ) |
36 | - fortran_libs="/opt/fortran/lib" ;; | | 48 | - fortran_libs="/opt/fortran/lib" ;; |
37 | - * ) | | 49 | - * ) |
38 | - fortran_libs="" ;; | | 50 | - fortran_libs="" ;; |
39 | - esac | | 51 | - esac |
40 | -fi; | | 52 | -fi; |
41 | - | | 53 | - |
42 | -#--------------------------------------------------------------------- | | 54 | -#--------------------------------------------------------------------- |
43 | -# What are the names of the native Fortran libraries? The patterns | | 55 | -# What are the names of the native Fortran libraries? The patterns |
44 | -# are not necessarily exclusive, so their order is important. | | 56 | -# are not necessarily exclusive, so their order is important. |
45 | -#--------------------------------------------------------------------- | | 57 | -#--------------------------------------------------------------------- |
46 | - | | 58 | - |
47 | -case "$host" in | | 59 | -case "$host" in |
48 | - alpha* ) f77_lib_names="Futil ots for Ufor" ;; | | 60 | - alpha* ) f77_lib_names="Futil ots for Ufor" ;; |
49 | - *-aix* ) f77_lib_names="xlf xlf90" ;; | | 61 | - *-aix* ) f77_lib_names="xlf xlf90" ;; |
50 | - *-hpux1* ) f77_lib_names="cl U77" ;; | | 62 | - *-hpux1* ) f77_lib_names="cl U77" ;; |
51 | - *-hpux9* ) f77_lib_names="f U77" ;; | | 63 | - *-hpux9* ) f77_lib_names="f U77" ;; |
52 | - *-hpux* ) f77_lib_names="F77 I77 IO77" ;; | | 64 | - *-hpux* ) f77_lib_names="F77 I77 IO77" ;; |
53 | - *-dec-ultrix* ) f77_lib_names="for i util ots I77 U77 F77" ;; | | 65 | - *-dec-ultrix* ) f77_lib_names="for i util ots I77 U77 F77" ;; |
54 | - mips-sgi-irix*) f77_lib_names="F77 I77 U77 isam fpe ftn" ;; | | 66 | - mips-sgi-irix*) f77_lib_names="F77 I77 U77 isam fpe ftn" ;; |
55 | - mips-* ) f77_lib_names="F77 I77 U77 isam" ;; | | 67 | - mips-* ) f77_lib_names="F77 I77 U77 isam" ;; |
56 | - *-solaris2* ) f77_lib_names="F77 M77 sunmath" ;; | | 68 | - *-solaris2* ) f77_lib_names="F77 M77 sunmath" ;; |
57 | - *-sunos4* ) f77_lib_names="F77 V77" ;; | | 69 | - *-sunos4* ) f77_lib_names="F77 V77" ;; |
58 | - titan-* ) f77_lib_names="iF77 uF77 mF77" ;; | | 70 | - titan-* ) f77_lib_names="iF77 uF77 mF77" ;; |
59 | - *-unicos* ) f77_lib_names="F77 I77 sci f" ;; | | 71 | - *-unicos* ) f77_lib_names="F77 I77 sci f" ;; |
60 | - * ) f77_lib_names="F77 I77" ;; | | 72 | - * ) f77_lib_names="F77 I77" ;; |
61 | -esac | | 73 | -esac |
62 | -f77_lib_names="$f77_lib_names g2c f2c" | | 74 | -f77_lib_names="$f77_lib_names g2c f2c" |
63 | -for f in $f77_lib_names; do reversed_names="$f $reversed_names"; done | | 75 | -for f in $f77_lib_names; do reversed_names="$f $reversed_names"; done |
64 | - | | 76 | - |
65 | -#--------------------------------------------------------------------- | | 77 | -#--------------------------------------------------------------------- |
66 | # On linux (and perhaps other GNU systems), the linker has trouble | | 78 | # On linux (and perhaps other GNU systems), the linker has trouble |
67 | # with dynamically linked Fortran. | | 79 | # with dynamically linked Fortran. |
68 | #--------------------------------------------------------------------- | | 80 | #--------------------------------------------------------------------- |
69 | | | 81 | |
70 | cat >> confdefs.h <<\EOF | | 82 | cat >> confdefs.h <<\EOF |
71 | -#if linux | | 83 | -#if linux |
72 | +#if linux || defined(__NetBSD__) || defined(__DragonFly__) | | 84 | +#if linux || defined(__NetBSD__) || defined(__DragonFly__) |
73 | void MAIN__ (void) {abort();} | | 85 | void MAIN__ (void) {abort();} |
74 | #endif | | 86 | #endif |
75 | EOF | | 87 | EOF |