summaryrefslogtreecommitdiff
path: root/math/R/patches/patch-aa
blob: 23cf99ac22fbd731255bc119876a4f94c9831d94 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
$NetBSD: patch-aa,v 1.12 2004/01/05 12:20:57 markd Exp $

--- configure.ac.orig	2003-09-17 11:01:04.000000000 +1200
+++ configure.ac
@@ -134,7 +134,7 @@ AC_ARG_ENABLE([R-shlib],
 [want_R_shlib=no])
 AM_CONDITIONAL(WANT_R_SHLIB, [test "x${want_R_shlib}" = xyes])
 if test "${want_R_shlib}" = yes; then
-  LIBR="-L\$(R_HOME)/bin -lR"
+  LIBR="-Wl,-R${prefix}/lib/R/bin -L\$(R_HOME)/bin -lR"
 else
   LIBR=
 fi
@@ -436,9 +436,9 @@ AC_SUBST(LIBM)
 ## AC_CHECK_LIBM computes LIBM but does not add to LIBS, hence we do
 ## the following as well.
 AC_CHECK_LIB(m, sin)
-AC_CHECK_LIB(ncurses, main, [],
-             AC_CHECK_LIB(termcap, main, [],
-                          AC_CHECK_LIB(termlib, main)))
+AC_CHECK_LIB(termcap, main, [],
+             AC_CHECK_LIB(termlib, main, [],
+                          AC_CHECK_LIB(ncurses, main)))
 case "${host_os}" in
   darwin*)
     AM_CONDITIONAL(BUILD_DLFCN_DARWIN, true)
@@ -592,13 +592,6 @@ case "${host_cpu}" in
       R_PROG_CC_FLAG([-ieee_with_inexact],
                      R_SH_VAR_ADD(R_XTRA_CFLAGS, [-ieee_with_inexact]))
     fi
-    if test "${G77}" = yes; then
-      R_PROG_F77_FLAG([-mieee],
-                      R_SH_VAR_ADD(R_XTRA_FFLAGS, [-mieee]))
-    else
-      R_PROG_F77_FLAG([-fpe3],
-                      R_SH_VAR_ADD(R_XTRA_FFLAGS, [-fpe3]))
-    fi
     if test "${GXX}" = yes; then
       R_PROG_CXX_FLAG([-mieee],
                       R_SH_VAR_ADD(R_XTRA_CXXFLAGS, [-mieee]))
@@ -891,6 +884,7 @@ case "${host_os}" in
     fpicflags=
     ;;
   netbsd*)
+    fpicflags="-fPIC"
     if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
       main_ldflags="-export-dynamic"
       shlib_ldflags="-shared"