diff options
Diffstat (limited to 'math/R/patches/patch-ac')
| -rw-r--r-- | math/R/patches/patch-ac | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac index ef83b5c39d8..f0e6a6af9c3 100644 --- a/math/R/patches/patch-ac +++ b/math/R/patches/patch-ac @@ -1,19 +1,19 @@ -$NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ +$NetBSD: patch-ac,v 1.14 2005/05/02 16:57:19 drochner Exp $ ---- configure.orig 2004-09-21 11:05:49.000000000 +1200 +--- configure.orig 2005-04-19 00:11:52.000000000 +0200 +++ configure -@@ -2204,7 +2204,7 @@ else - WANT_R_SHLIB_FALSE= +@@ -2170,7 +2170,7 @@ else fi + if test "${want_R_shlib}" = yes; then - LIBR="-L\$(R_HOME)/lib -lR" + LIBR="-Wl,-R${prefix}/lib/R/lib -L\$(R_HOME)/lib -lR" else LIBR= fi -@@ -21299,13 +21299,13 @@ _ACEOF - fi - +@@ -21681,13 +21681,13 @@ fi + ## only need ncurses if libreadline is not statically linked against it + unset ac_cv_lib_readline_rl_callback_read_char -echo "$as_me:$LINENO: checking for main in -lncurses" >&5 -echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6 @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21344,35 +21344,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21726,35 +21726,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -76,7 +76,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21411,35 +21411,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21793,35 +21793,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -123,7 +123,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21478,25 +21478,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21860,25 +21860,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -156,7 +156,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ fi -@@ -26355,6 +26355,7 @@ cat > conftest.c <<EOF +@@ -27049,6 +27049,7 @@ cat > conftest.c <<EOF #else # define F77_SYMBOL(x) x #endif @@ -164,7 +164,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ int main () { exit(0); } -@@ -26423,6 +26424,9 @@ cat > conftest.c <<EOF +@@ -27117,6 +27118,9 @@ cat > conftest.c <<EOF extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y); @@ -174,7 +174,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ int main () { int a[3] = {17, 237, 2000000000}, b[2], res = 0; double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3]; -@@ -26511,6 +26515,9 @@ typedef struct { +@@ -27205,6 +27209,9 @@ typedef struct { extern void F77_SYMBOL(cftest)(Rcomplex *x); @@ -184,7 +184,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ int main () { Rcomplex z[3]; -@@ -27651,157 +27658,6 @@ echo "${ECHO_T}no" >&6 +@@ -28031,157 +28038,6 @@ echo "${ECHO_T}no" >&6 fi fi @@ -342,7 +342,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ if test "${GXX}" = yes; then ac_safe=_mieee echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5 -@@ -28751,6 +28607,7 @@ fi ;; +@@ -29135,6 +28991,7 @@ fi ;; fpicflags= ;; netbsd*) |