Add support for SunOS-*-i386. Tested on 32-bit SmartOS.

5 files changed, 24 insertions, 8 deletions

diff --git a/lang/ghc/patches/patch-ac b/lang/ghc/patches/patch-ac
index 23a7b03e6fb..59a464133cc 100644
--- a/lang/ghc/patches/patch-ac
+++ b/lang/ghc/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2008/03/17 15:33:10 kristerw Exp $
+$NetBSD: patch-ac,v 1.8 2012/08/17 15:49:35 jperkin Exp $
 
 --- rts/package.conf.in.orig	2007-12-10 16:11:32.000000000 -0200
 +++ rts/package.conf.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.7 2008/03/17 15:33:10 kristerw Exp $
  cc-options:
  
 -ld-options:
-+ld-options: "-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib",
++ld-options: "-Wl,-R@PREFIX@/lib","-L@PREFIX@/lib",
  #ifdef LEADING_UNDERSCORE
             "-u", "_base_GHCziBase_Izh_static_info"
           , "-u", "_base_GHCziBase_Czh_static_info"
diff --git a/lang/ghc/patches/patch-ad b/lang/ghc/patches/patch-ad
index 519a26b5268..36d09a0bce7 100644
--- a/lang/ghc/patches/patch-ad
+++ b/lang/ghc/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.9 2008/03/17 15:33:10 kristerw Exp $
+$NetBSD: patch-ad,v 1.10 2012/08/17 15:49:35 jperkin Exp $
 
 --- libraries/readline/readline.cabal.orig	2007-12-10 16:20:29.000000000 -0200
 +++ libraries/readline/readline.cabal
@@ -6,4 +6,4 @@ $NetBSD: patch-ad,v 1.9 2008/03/17 15:33:10 kristerw Exp $
    includes:	HsReadline.h
    install-includes:	HsReadline.h HsReadlineConfig.h
    c-sources:	HsReadline_cbits.c
-+  ld-options:    "-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib"
++  ld-options:    "-Wl,-R@PREFIX@/lib","-L@PREFIX@/lib"
diff --git a/lang/ghc/patches/patch-af b/lang/ghc/patches/patch-af
index 4f4b6b07ad1..f9077215858 100644
--- a/lang/ghc/patches/patch-af
+++ b/lang/ghc/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.7 2007/03/24 17:57:20 kristerw Exp $
+$NetBSD: patch-af,v 1.8 2012/08/17 15:49:35 jperkin Exp $
 
 --- ../ghc-6.4.2/ghc/rts/package.conf.in.orig	2005-05-20 21:07:55.000000000 +0200
 +++ ../ghc-6.4.2/ghc/rts/package.conf.in	2005-05-20 21:08:58.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.7 2007/03/24 17:57:20 kristerw Exp $
  cc-options:
  
 -ld-options:
-+ld-options: "-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib",
++ld-options: "-Wl,-R@PREFIX@/lib","-L@PREFIX@/lib",
  #ifdef LEADING_UNDERSCORE
             "-u", "_GHCziBase_Izh_static_info"
           , "-u", "_GHCziBase_Czh_static_info"
diff --git a/lang/ghc/patches/patch-ag b/lang/ghc/patches/patch-ag
index 34cec76b659..690fea6a7c9 100644
--- a/lang/ghc/patches/patch-ag
+++ b/lang/ghc/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2007/03/24 17:57:20 kristerw Exp $
+$NetBSD: patch-ag,v 1.6 2012/08/17 15:49:36 jperkin Exp $
 
 --- ../ghc-6.4.2/libraries/readline/package.conf.in.orig	2005-05-20 20:59:44.000000000 +0200
 +++ ../ghc-6.4.2/libraries/readline/package.conf.in	2005-05-20 21:07:43.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.5 2007/03/24 17:57:20 kristerw Exp $
  hugs-options:
  cc-options:
 -ld-options:
-+ld-options:	"-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib"
++ld-options:	"-Wl,-R@PREFIX@/lib","-L@PREFIX@/lib"
  framework-dirs:
  frameworks:
  haddock-interfaces:	HADDOCK_IFACE
diff --git a/lang/ghc/patches/patch-au b/lang/ghc/patches/patch-au
new file mode 100644
index 00000000000..6f784ccdd93
--- /dev/null
+++ b/lang/ghc/patches/patch-au
@@ -0,0 +1,16 @@
+$NetBSD: patch-au,v 1.1 2012/08/17 15:49:36 jperkin Exp $
+
+--- ../ghc-6.4.2/ghc/rts/RtsUtils.c.orig	2012-08-17 14:05:20.740303579 +0000
++++ ../ghc-6.4.2/ghc/rts/RtsUtils.c	2012-08-17 14:06:13.029606465 +0000
+@@ -187,7 +187,11 @@
+     if (now == 0) {
+ 	time(&now);
+ #if HAVE_CTIME_R
++#  ifdef __sun
++	ctime_r(&now, nowstr, sizeof(nowstr));
++#  else
+ 	ctime_r(&now, nowstr);
++#  endif
+ #else
+ 	strcpy(nowstr, ctime(&now));
+ #endif