[53620] trunk/dports/lang/ghc

[gwright at macports.org]

Revision: 53620
          http://trac.macports.org/changeset/53620
Author:   gwright at macports.org
Date:     2009-07-09 22:45:25 -0700 (Thu, 09 Jul 2009)
Log Message:
-----------
Add a patch to fix process hangs on some versions of OS X (shouldn't be needed
inthe upcoming 6.10.4).  Also, clean up some unneeded changes related to the
attempts to fix the build on Tiger.  This reverts the removal of the ghc.cabal.in
patch; that may be the main cause of the recent build failures.

Modified Paths:
--------------
    trunk/dports/lang/ghc/Portfile

Added Paths:
-----------
    trunk/dports/lang/ghc/files/patch-runProcess.c.diff

Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile	2009-07-10 04:52:59 UTC (rev 53619)
+++ trunk/dports/lang/ghc/Portfile	2009-07-10 05:45:25 UTC (rev 53620)
@@ -5,7 +5,7 @@
 name		ghc
 set canonicalname	ghc
 version		6.10.3
-revision	1
+revision	3
 categories	lang haskell
 maintainers	gwright
 platforms	darwin
@@ -53,7 +53,9 @@
 #
 patchfiles	patch-configure.ac.diff			\
 		patch-aclocal.m4.diff			\
-		patch-libraries-Makefile.diff
+		patch-compiler-ghc.cabal.in.diff	\
+		patch-libraries-Makefile.diff		\
+		patch-runProcess.c.diff
 
 depends_lib	port:libedit \
 		port:gmp
@@ -196,9 +198,9 @@
 post-patch	{
 		reinplace "s|XXPATH_TO_HSC2HSXX|${workpath}/ghc-bootstrap/bin/hsc2hs|" ${worksrcpath}/libraries/Makefile
 
-#		reinplace "s|XXPATH_TO_GMP_LIBRARYXX|${prefix}/lib|" ${worksrcpath}/compiler/ghc.cabal.in
+		reinplace "s|XXMACPORTS_PREFIXXX|${prefix}|" ${worksrcpath}/compiler/ghc.cabal.in
 
-		reinplace "s|/opt/local/lib/ghc-${ghc_bootversion}|${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}|g" ${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/package.conf
+		reinplace "s|/opt/local/lib/ghc-${ghc_bootversion}|${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}|g" ${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/package.conf
 
 		reinplace "s|GHCBIN=/opt/local|GHCBIN=${workpath}/${canonicalname}-bootstrap|" ${workpath}/${canonicalname}-bootstrap/bin/ghc
 
@@ -210,7 +212,6 @@
 			reinplace "s|/opt/local|${prefix}|g" \
 				${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/ghc-asm \
 				${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/ghc-split \
-				${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/package.conf
 		}
 }
 
@@ -328,9 +329,3 @@
 	}
 }
 
-# Fix a bug in the definition of 6.10.2's rts package:
-#
-post-activate {
-	system "${prefix}/bin/ghc-pkg describe rts | sed 's/PAPI_INCLUDE_DIR//' | ${prefix}/bin/ghc-pkg update -"
-}
-

Added: trunk/dports/lang/ghc/files/patch-runProcess.c.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-runProcess.c.diff	                        (rev 0)
+++ trunk/dports/lang/ghc/files/patch-runProcess.c.diff	2009-07-10 05:45:25 UTC (rev 53620)
@@ -0,0 +1,23 @@
+--- libraries/process/cbits/runProcess.c.sav	2009-06-21 10:31:51.000000000 -0400
++++ libraries/process/cbits/runProcess.c	2009-06-21 10:33:29.000000000 -0400
+@@ -63,10 +63,12 @@
+     // shared between parent and child), and the parent behaves as if
+     // the signal had been raised.
+     blockUserSignals();
++    stopTimer();
+ 
+     switch(pid = fork())
+     {
+     case -1:
++        startTimer();
+         unblockUserSignals();
+         if (fdStdIn == -1) {
+             close(fdStdInput[0]);
+@@ -184,6 +186,7 @@
+         }
+ 	break;
+     }
++    startTimer();
+     unblockUserSignals();
+     
+     return pid;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090709/8c611099/attachment-0001.html>