[42399] trunk/dports/lang/ghc

[gwright at macports.org]

Revision: 42399
          http://trac.macports.org/changeset/42399
Author:   gwright at macports.org
Date:     2008-11-20 13:02:31 -0800 (Thu, 20 Nov 2008)
Log Message:
-----------
Brute force fix to the build problem on i386/Tiger.

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

Added Paths:
-----------
    trunk/dports/lang/ghc/files/patch-compiler-ghc.cabal.in.diff

Removed Paths:
-------------
    trunk/dports/lang/ghc/files/patch-rts-Stats.c.diff

Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile	2008-11-20 18:51:49 UTC (rev 42398)
+++ trunk/dports/lang/ghc/Portfile	2008-11-20 21:02:31 UTC (rev 42399)
@@ -4,7 +4,7 @@
 
 name		ghc
 version		6.10.1
-revision	7	
+revision	8	
 categories	lang haskell
 maintainers	gwright
 platforms	darwin
@@ -43,16 +43,17 @@
 # ghc does not support a universal build:
 universal_variant	no
 
-# The patch-rts-Stats.c.diff file fixes a very obscure compiler
-# bug on ppc/Tiger in which the include path gets messed up.
+# On (at least) i386/Tiger, the file compiler/ghc.cabal.in needs to be
+# patched so it can find the GMP library.
 #
 patchfiles	patch-configure.ac.diff		\
 		patch-aclocal.m4.diff		\
 		patch-libraries-Makefile.diff	\
-		patch-rts-Stats.c.diff
+		patch-compiler-ghc.cabal.in.diff
 
 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
 }
 
 depends_lib	port:libedit \
@@ -208,7 +209,6 @@
 	  	puts $cfg "#"
 	  	puts $cfg "# Local configuration overrides for MacPorts"
 	  	puts $cfg "#"
-	  	puts $cfg "SRC_CC_OPTS += -I${prefix}/include -L${prefix}/lib"
 	  	puts $cfg "SRC_HC_OPTS += -I${prefix}/include -L${prefix}/lib"
 	  	puts $cfg "EXTRA_HSC2HS_OPTS += -I${prefix}/include --lflag=\"-L${prefix}/lib\""
 	  	puts $cfg "EXTRA_LD_OPTS += -L${prefix}/lib"

Added: trunk/dports/lang/ghc/files/patch-compiler-ghc.cabal.in.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-compiler-ghc.cabal.in.diff	                        (rev 0)
+++ trunk/dports/lang/ghc/files/patch-compiler-ghc.cabal.in.diff	2008-11-20 21:02:31 UTC (rev 42399)
@@ -0,0 +1,10 @@
+--- compiler/ghc.cabal.in.sav	2008-11-20 11:22:10.000000000 -0500
++++ compiler/ghc.cabal.in	2008-11-20 11:24:13.000000000 -0500
+@@ -76,6 +76,7 @@
+         CPP-Options: -DUSE_EDITLINE
+ 
+     GHC-Options: -Wall -fno-warn-name-shadowing -fno-warn-orphans
++    extra-lib-dirs: XXPATH_TO_GMP_LIBRARYXX
+ 
+     if flag(ghci)
+         Build-Depends: template-haskell

Deleted: trunk/dports/lang/ghc/files/patch-rts-Stats.c.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-rts-Stats.c.diff	2008-11-20 18:51:49 UTC (rev 42398)
+++ trunk/dports/lang/ghc/files/patch-rts-Stats.c.diff	2008-11-20 21:02:31 UTC (rev 42399)
@@ -1,11 +0,0 @@
---- rts/Stats.c.sav	2008-11-19 18:03:40.000000000 -0500
-+++ rts/Stats.c	2008-11-19 18:03:55.000000000 -0500
-@@ -16,7 +16,7 @@
- #include "ParTicky.h"                       /* ToDo: move into Rts.h */
- #include "Profiling.h"
- #include "GetTime.h"
--#include "GC.h"
-+#include "sm/GC.h"
- 
- #if USE_PAPI
- #include "Papi.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081120/1269153b/attachment.html>