On Sun, May 02, 2010 at 12:25:33PM +0200, Matthias Kilian wrote:
> > Disable threads for now, in the hope that the build results will
> > stop depending on the output of pom(6).
>
> Disregard for now. It breaks libraries/unix. I'll send a better diff
> later.
This one should be better:
Disable threads for now, in the hope that the build results will
stop depending on the output of pom(6). This also removes the module
`System.Posix.Semaphore' from package `unix' for obvious reasons.
Note that at least devel/darcs will need a patch (not only a wantlib
change) to be buildable with the nonthreaded ghc.
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 2 May 2010 17:28:40 -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: ghc.port.mk
===================================================================
RCS file: /cvs/ports/lang/ghc/ghc.port.mk,v
retrieving revision 1.7
diff -u -p -r1.7 ghc.port.mk
--- ghc.port.mk 22 Apr 2010 21:49:37 -0000 1.7
+++ ghc.port.mk 2 May 2010 17:28:40 -0000
@@ -46,7 +46,7 @@ SUBST_VARS += DISTNAME MODGHC_HACKAGE_
. if ${MODGHC_BUILD:L:Mcabal}
MODGHC_SETUP_SCRIPT ?= Setup.lhs Setup.hs
MODGHC_SETUP_PROG ?= ${WRKSRC}/Setup
-MODGHC_SETUP_CONF_ARGS ?= configure -g -O --prefix=${PREFIX}
+MODGHC_SETUP_CONF_ARGS ?=
MODGHC_SETUP_CONF_ENV ?= HOME=${PORTHOME} PATH=${PATH}
. if ${MODGHC_BUILD:L:Mhaddock}
@@ -65,7 +65,9 @@ MODCABAL_configure = \
break; \
done && \
cd ${WRKBUILD} && exec ${SETENV} ${MODGHC_SETUP_CONF_ENV} \
- ${MODGHC_SETUP_PROG} ${MODGHC_SETUP_CONF_ARGS}
+ ${MODGHC_SETUP_PROG} \
+ configure -g -O --prefix=${PREFIX} \
+ ${MODGHC_SETUP_CONF_ARGS}
CONFIGURE_STYLE += CABAL
Index: patches/patch-libraries_unix_System_Posix_hs
===================================================================
RCS file: patches/patch-libraries_unix_System_Posix_hs
diff -N patches/patch-libraries_unix_System_Posix_hs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_unix_System_Posix_hs 2 May 2010 17:28:40
-0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- libraries/unix/System/Posix.hs.orig Tue Apr 20 20:10:13 2010
++++ libraries/unix/System/Posix.hs Sun May 2 12:30:38 2010
+@@ -26,7 +26,6 @@ module System.Posix (
+ module System.Posix.Time,
+ module System.Posix.User,
+ module System.Posix.Resource,
+- module System.Posix.Semaphore,
+ module System.Posix.SharedMem
+ ) where
+
+@@ -43,7 +42,6 @@ import System.Posix.Terminal
+ import System.Posix.Time
+ import System.Posix.User
+ import System.Posix.Resource
+-import System.Posix.Semaphore
+ import System.Posix.SharedMem
+
+ {- TODO
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 2 May 2010 17:28:40 -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-libraries_unix_unix_cabal
===================================================================
RCS file: patches/patch-libraries_unix_unix_cabal
diff -N patches/patch-libraries_unix_unix_cabal
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_unix_unix_cabal 2 May 2010 17:28:40 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- libraries/unix/unix.cabal.orig Tue Apr 20 20:10:14 2010
++++ libraries/unix/unix.cabal Sun May 2 12:30:02 2010
+@@ -45,7 +45,6 @@ Library
+ System.Posix.User
+ System.Posix.Signals
+ System.Posix.Signals.Exts
+- System.Posix.Semaphore
+ System.Posix.SharedMem
+ build-depends: base >= 4.2 && < 4.3
+ extensions: CPP, ForeignFunctionInterface, EmptyDataDecls
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 2 May 2010 17:28:40 -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-doc
===================================================================
RCS file: /cvs/ports/lang/ghc/pkg/PLIST-doc,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-doc
--- pkg/PLIST-doc 22 Apr 2010 21:49:37 -0000 1.9
+++ pkg/PLIST-doc 2 May 2010 17:28:40 -0000
@@ -2218,7 +2218,6 @@ share/doc/ghc/html/libraries/unix-2.4.0.
share/doc/ghc/html/libraries/unix-2.4.0.1/System-Posix-Process-Internals.html
share/doc/ghc/html/libraries/unix-2.4.0.1/System-Posix-Process.html
share/doc/ghc/html/libraries/unix-2.4.0.1/System-Posix-Resource.html
-share/doc/ghc/html/libraries/unix-2.4.0.1/System-Posix-Semaphore.html
share/doc/ghc/html/libraries/unix-2.4.0.1/System-Posix-SharedMem.html
share/doc/ghc/html/libraries/unix-2.4.0.1/System-Posix-Signals-Exts.html
share/doc/ghc/html/libraries/unix-2.4.0.1/System-Posix-Signals.html
@@ -2269,7 +2268,6 @@ share/doc/ghc/html/libraries/unix-2.4.0.
share/doc/ghc/html/libraries/unix-2.4.0.1/mini_System-Posix-Process-Internals.html
share/doc/ghc/html/libraries/unix-2.4.0.1/mini_System-Posix-Process.html
share/doc/ghc/html/libraries/unix-2.4.0.1/mini_System-Posix-Resource.html
-share/doc/ghc/html/libraries/unix-2.4.0.1/mini_System-Posix-Semaphore.html
share/doc/ghc/html/libraries/unix-2.4.0.1/mini_System-Posix-SharedMem.html
share/doc/ghc/html/libraries/unix-2.4.0.1/mini_System-Posix-Signals-Exts.html
share/doc/ghc/html/libraries/unix-2.4.0.1/mini_System-Posix-Signals.html
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 2 May 2010 17:28:41 -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/
@@ -2464,8 +2460,6 @@ lib/ghc/unix-2.4.0.1/System/Posix/Proces
lib/ghc/unix-2.4.0.1/System/Posix/Process/Internals.p_hi
lib/ghc/unix-2.4.0.1/System/Posix/Resource.hi
lib/ghc/unix-2.4.0.1/System/Posix/Resource.p_hi
-lib/ghc/unix-2.4.0.1/System/Posix/Semaphore.hi
-lib/ghc/unix-2.4.0.1/System/Posix/Semaphore.p_hi
lib/ghc/unix-2.4.0.1/System/Posix/SharedMem.hi
lib/ghc/unix-2.4.0.1/System/Posix/SharedMem.p_hi
lib/ghc/unix-2.4.0.1/System/Posix/Signals/
