[42371] trunk/dports/lang/ghc

[gwright at macports.org]

Revision: 42371
          http://trac.macports.org/changeset/42371
Author:   gwright at macports.org
Date:     2008-11-19 18:55:15 -0800 (Wed, 19 Nov 2008)
Log Message:
-----------
Avoid an obscure compiler bug and maybe not mess up the
proposed fix for #17321.

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

Added 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 02:51:30 UTC (rev 42370)
+++ trunk/dports/lang/ghc/Portfile	2008-11-20 02:55:15 UTC (rev 42371)
@@ -4,7 +4,7 @@
 
 name		ghc
 version		6.10.1
-revision	6	
+revision	7	
 categories	lang haskell
 maintainers	gwright
 platforms	darwin
@@ -43,9 +43,13 @@
 # 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.
+#
 patchfiles	patch-configure.ac.diff		\
 		patch-aclocal.m4.diff		\
-		patch-libraries-Makefile.diff
+		patch-libraries-Makefile.diff	\
+		patch-rts-Stats.c.diff
 
 post-patch	{
 		reinplace "s|XXPATH_TO_HSC2HSXX|${workpath}/ghc-bootstrap/bin/hsc2hs|" ${worksrcpath}/libraries/Makefile
@@ -214,7 +218,11 @@
 #bugs		GHC does not support DESTDIR. Instead, we install	\
 #		everything into ${destroot}${prefix}, and then fix up	\
 #		the five scripts which actually have the installation	\
-#		path hard coded.
+#		path hard coded.					\
+#									\
+#		The odd "ac_cv_lib_elf_nlist" environment variable	\
+#		is required to avoid including the wrong nlist.h	\
+#		header if libelf is installed on the system.
 
 configure.ldflags-append	"-L/usr/lib"
 configure.cflags-append		"-I${prefix}/include"

Added: trunk/dports/lang/ghc/files/patch-rts-Stats.c.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-rts-Stats.c.diff	                        (rev 0)
+++ trunk/dports/lang/ghc/files/patch-rts-Stats.c.diff	2008-11-20 02:55:15 UTC (rev 42371)
@@ -0,0 +1,11 @@
+--- 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/20081119/d2220efc/attachment.html>