[70029] trunk/dports/lang/ghc/Portfile

[gwright at macports.org]

Revision: 70029
          http://trac.macports.org/changeset/70029
Author:   gwright at macports.org
Date:     2010-07-27 02:55:33 -0700 (Tue, 27 Jul 2010)
Log Message:
-----------
Fixed the rest of the libffi problem.  An earlier change made sure
ghc's internal libffi was linked with compiled executable, but in the
compiler itself MacPorts's libffi was used instead of the internal
one.  This fix makes sure the libffi built along with the compiler
is actually linked into it.  (If MacPorts's libffi were linked into
the compiler and later removed, the compiler would fail since the
libffi port is not a dependency.  But making MacPorts's libffi a
dependency is not a good idea, since ghc is only tested with the
version of libffi shipped with it.  Hence a bit more path jiggery-
pokery to get the right library linked in.)

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

Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile	2010-07-27 00:28:39 UTC (rev 70028)
+++ trunk/dports/lang/ghc/Portfile	2010-07-27 09:55:33 UTC (rev 70029)
@@ -6,7 +6,7 @@
 name		ghc
 set canonicalname	ghc
 version		6.10.4
-revision	2
+revision	3
 categories	lang haskell
 maintainers	gwright
 platforms	darwin
@@ -374,6 +374,7 @@
 	  	puts $cfg "#"
 	  	puts $cfg "# Local configuration overrides for MacPorts"
 	  	puts $cfg "#"
+	  	puts $cfg "SRC_HC_OPTS += -L${worksrcpath}/libffi"
 	  	puts $cfg "SRC_HC_OPTS += -I${prefix}/include -L${prefix}/lib"
 
 		if {[variant_isset maintainer_debug]} {
@@ -381,6 +382,7 @@
 		}
 
 	  	puts $cfg "EXTRA_HSC2HS_OPTS += -I${prefix}/include --lflag=\"-L${prefix}/lib\""
+	  	puts $cfg "EXTRA_LD_OPTS += -L${worksrcpath}/libffi"
 	  	puts $cfg "EXTRA_LD_OPTS += -L${prefix}/lib"
 		puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=${prefix}/include"
 		puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${prefix}/lib"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100727/e0121768/attachment-0001.html>