Disable threads for now, in the hope that the build results will
stop depending on the output of pom(6).
Only built and lightly tested on amd64 here, but I'll run the haddock
crash test from dcoppa@ tomorrow, and I'll also try it on my
super-slow i386.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 25 Apr 2010 13:40:30 -0000 1.31
+++ Makefile 1 May 2010 20:06:21 -0000
@@ -4,7 +4,7 @@ COMMENT-main = compiler for the functio
COMMENT-doc = documentation for GHC
DISTNAME = ghc-${MODGHC_VER}
-PKGNAME-main = ghc-${MODGHC_VER}p0
+PKGNAME-main = ghc-${MODGHC_VER}p1
PKGNAME-doc = ghc-doc-${MODGHC_VER}
CATEGORIES = lang devel
HOMEPAGE = http://www.haskell.org/ghc/
Index: patches/patch-libraries_unix_configure
===================================================================
RCS file: patches/patch-libraries_unix_configure
diff -N patches/patch-libraries_unix_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_unix_configure 1 May 2010 20:06:21 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- libraries/unix/configure.orig Tue Apr 20 20:11:13 2010
++++ libraries/unix/configure Sat May 1 20:32:36 2010
+@@ -6649,12 +6649,6 @@ test -n "$target_alias" &&
+ PTHREAD_CFLAGS=
+ PTHREAD_LDFLAGS=
+ PTHREAD_LIBS=
+-case "$host_os" in
+-openbsd*)
+- PTHREAD_CFLAGS=-pthread
+- PTHREAD_LDFLAGS=-pthread
+- ;;
+-esac
+
+
+
Index: patches/patch-mk_config_mk_in
===================================================================
RCS file: patches/patch-mk_config_mk_in
diff -N patches/patch-mk_config_mk_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-mk_config_mk_in 1 May 2010 20:06:21 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- mk/config.mk.in.orig Tue Apr 20 20:10:07 2010
++++ mk/config.mk.in Sat May 1 09:58:03 2010
+@@ -248,9 +248,9 @@ endif
+ # Want the threaded versions unless we're unregisterised
+ # Defer the check until later by using $(if..), because GhcUnregisterised
might
+ # be set in build.mk, which hasn't been read yet.
+-GhcRTSWays += $(if $(findstring NO, $(GhcUnregisterised)),thr thr_debug
thr_l,)
+-GhcRTSWays += $(if $(findstring p, $(GhcLibWays)),$(if $(findstring NO,
$(GhcUnregisterised)),thr_p,),)
+-GhcRTSWays += $(if $(findstring dyn, $(GhcLibWays)), dyn debug_dyn $(if
$(findstring NO, $(GhcUnregisterised)),thr_dyn thr_debug_dyn),)
++# GhcRTSWays += $(if $(findstring NO, $(GhcUnregisterised)),thr thr_debug
thr_l,)
++# GhcRTSWays += $(if $(findstring p, $(GhcLibWays)),$(if $(findstring NO,
$(GhcUnregisterised)),thr_p,),)
++# GhcRTSWays += $(if $(findstring dyn, $(GhcLibWays)), dyn debug_dyn $(if
$(findstring NO, $(GhcUnregisterised)),thr_dyn thr_debug_dyn),)
+
+ # We can only build GHCi threaded if we have a threaded RTS:
+ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/ghc/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 22 Apr 2010 21:49:37 -0000 1.4
+++ pkg/PLIST-main 1 May 2010 20:06:22 -0000
@@ -2196,10 +2196,6 @@ lib/ghc/libHSrts.a
lib/ghc/libHSrts_debug.a
lib/ghc/libHSrts_l.a
lib/ghc/libHSrts_p.a
-lib/ghc/libHSrts_thr.a
-lib/ghc/libHSrts_thr_debug.a
-lib/ghc/libHSrts_thr_l.a
-lib/ghc/libHSrts_thr_p.a
lib/ghc/libHSrtsmain.a
lib/ghc/mtl-1.1.0.2/
lib/ghc/mtl-1.1.0.2/Control/
