Use the correct linker flags on Solaris/GCC.

Fixes Solaris 64-bit build.

2 files changed, 38 insertions, 15 deletions

diff --git a/math/R/distinfo b/math/R/distinfo
index db9874b1945..7e295f2b2a5 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.48 2012/04/15 03:29:48 markd Exp $
+$NetBSD: distinfo,v 1.49 2012/08/02 13:52:17 jperkin Exp $
 
 SHA1 (R-2.14.2.tar.gz) = 523dca7694e4d0c8701fcc783ea3767e46fe7a62
 RMD160 (R-2.14.2.tar.gz) = 6055dd28a99baa7b23c55f74dc1479e93a0dee58
 Size (R-2.14.2.tar.gz) = 23893986 bytes
-SHA1 (patch-ac) = ea885d8391ec06a7cc7fcbbadce134c794b7a47c
+SHA1 (patch-ac) = f7d2809581bcc13de0fc04f622f2e10f5452e911
 SHA1 (patch-ad) = 43ae23bd0815986c3bac661bd3354cd96b3e54e4
 SHA1 (patch-src_main_format.c) = f337358361cd81547305d61be4682c4f73b6531a
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
index 4b4ef24519b..066d641c55e 100644
--- a/math/R/patches/patch-ac
+++ b/math/R/patches/patch-ac
@@ -1,8 +1,10 @@
-$NetBSD: patch-ac,v 1.26 2011/11/20 04:57:03 markd Exp $
+$NetBSD: patch-ac,v 1.27 2012/08/02 13:52:18 jperkin Exp $
 
---- configure.orig	2011-10-23 22:05:54.000000000 +0000
-+++ configure
-@@ -3867,7 +3867,7 @@ fi
+Ensure the correct linker flags are used on Solaris/GCC.
+
+--- configure.orig	Thu Feb 23 23:06:08 2012
++++ configure	Thu Aug  2 13:37:29 2012
+@@ -3946,7 +3946,7 @@
  
  
  if test "${want_R_shlib}" = yes; then
@@ -11,7 +13,7 @@ $NetBSD: patch-ac,v 1.26 2011/11/20 04:57:03 markd Exp $
  else
    LIBR=
  fi
-@@ -22728,6 +22728,11 @@ fi
+@@ -22869,6 +22869,11 @@
  	  done
  	  ;;
  	-[lLR]*)
@@ -23,7 +25,7 @@ $NetBSD: patch-ac,v 1.26 2011/11/20 04:57:03 markd Exp $
  	    ac_exists=false
    for ac_i in $ac_cv_f77_libs; do
      if test x"$ac_arg" = x"$ac_i"; then
-@@ -23613,6 +23618,7 @@ cat > conftest.c <<EOF
+@@ -23758,6 +23763,7 @@
  #else
  # define F77_SYMBOL(x)   x
  #endif
@@ -31,7 +33,7 @@ $NetBSD: patch-ac,v 1.26 2011/11/20 04:57:03 markd Exp $
  int main () {
    exit(0);
  }
-@@ -23689,6 +23695,9 @@ cat > conftest.c <<EOF
+@@ -23834,6 +23840,9 @@
  
  extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
  
@@ -41,7 +43,7 @@ $NetBSD: patch-ac,v 1.26 2011/11/20 04:57:03 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];
-@@ -23784,6 +23793,9 @@ typedef struct {
+@@ -23929,6 +23938,9 @@
  
  extern void F77_SYMBOL(cftest)(Rcomplex *x);
  
@@ -51,7 +53,7 @@ $NetBSD: patch-ac,v 1.26 2011/11/20 04:57:03 markd Exp $
  int main () {
      Rcomplex z[3];
  
-@@ -25970,7 +25982,7 @@ $as_echo "$as_me: WARNING: Use of flat n
+@@ -26115,7 +26127,7 @@
        SHLIB_LIBADD="-lcc_dynamic"
      fi
      ;;
@@ -60,7 +62,7 @@ $NetBSD: patch-ac,v 1.26 2011/11/20 04:57:03 markd Exp $
      main_ldflags="-export-dynamic"
      shlib_ldflags="-shared"
      ;;
-@@ -26058,6 +26070,12 @@ $as_echo "$as_me: WARNING: Use of flat n
+@@ -26203,6 +26215,12 @@
      fcpicflags=
      ;;
    netbsd*)
@@ -73,7 +75,28 @@ $NetBSD: patch-ac,v 1.26 2011/11/20 04:57:03 markd Exp $
      if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
        main_ldflags="-export-dynamic"
        shlib_ldflags="-shared"
-@@ -26156,7 +26174,7 @@ fi
+@@ -26226,16 +26244,17 @@
+   solaris*)
+ ## SPARC has only an 8k global object table, 1024 entries on 64-bit,
+ ## so need PIC not pic.  They are the same on other Solaris platforms.
+-    shlib_ldflags="-G"
+-    shlib_cxxldflags="-G"
+     if test "${GCC}" = yes; then
++      shlib_ldflags="-shared"
++      shlib_cxxldflags="-shared"
+       ld=`${CC} -print-prog-name=ld`
+       ldoutput=`${ld} -v 2>&1 | grep GNU`
+       if test -n "${ldoutput}"; then
+ 	main_ldflags="-Wl,-export-dynamic"
+-	shlib_ldflags="-shared"
+       fi
+     else
++      shlib_ldflags="-G"
++      shlib_cxxldflags="-G"
+       cpicflags="-KPIC"
+       if test "`basename ${CXX}`" = "CC" ; then
+         ## Forte version 7 needs -lCstd: Forte 6 does not.
+@@ -26301,7 +26320,7 @@
  : ${FPICFLAGS="${fpicflags}"}
  if test -z "${FPICFLAGS}"; then
    case "${host_os}" in
@@ -82,7 +105,7 @@ $NetBSD: patch-ac,v 1.26 2011/11/20 04:57:03 markd Exp $
        ;;
      *)
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine FPICFLAGS." >&5
-@@ -29275,6 +29293,15 @@ cat > conftest.c <<EOF
+@@ -29430,6 +29449,15 @@
  #endif
  extern void F77_SYMBOL(test1)(int *iflag);
  
@@ -98,7 +121,7 @@ $NetBSD: patch-ac,v 1.26 2011/11/20 04:57:03 markd Exp $
  int main () {
    int iflag;
    F77_SYMBOL(test1)(&iflag);
-@@ -29342,6 +29369,14 @@ else
+@@ -29497,6 +29525,14 @@
  #else
  # define F77_SYMBOL(x)   x
  #endif