[53708] trunk/dports/lang/ghc
gwright at macports.org
gwright at macports.org
Sun Jul 12 07:05:33 PDT 2009
Revision: 53708
http://trac.macports.org/changeset/53708
Author: gwright at macports.org
Date: 2009-07-12 07:05:33 -0700 (Sun, 12 Jul 2009)
Log Message:
-----------
Revision 5 should fix #19856.
Revision Links:
--------------
http://trac.macports.org/changeset/5
Modified Paths:
--------------
trunk/dports/lang/ghc/Portfile
trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff
trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff
Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile 2009-07-12 13:56:36 UTC (rev 53707)
+++ trunk/dports/lang/ghc/Portfile 2009-07-12 14:05:33 UTC (rev 53708)
@@ -5,7 +5,7 @@
name ghc
set canonicalname ghc
version 6.10.3
-revision 4
+revision 5
categories lang haskell
maintainers gwright
platforms darwin
@@ -205,6 +205,8 @@
post-patch {
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|" ${worksrcpath}/libraries/Makefile
+
reinplace "s|XXPATH_TO_HSC2HSXX|${workpath}/ghc-bootstrap/bin/hsc2hs|" ${worksrcpath}/libraries/Makefile
reinplace "s|XXMACPORTS_PREFIXXX|${prefix}|" ${worksrcpath}/compiler/ghc.cabal.in
@@ -289,7 +291,8 @@
--datadir=${destroot}${prefix}/share/${canonicalname}-${version} \
--with-gmp-includes=${prefix}/include \
--with-gmp-libraries=${prefix}/lib \
- --with-ghc='${workpath}/${canonicalname}-bootstrap/bin/ghc'
+ --with-ghc='${workpath}/${canonicalname}-bootstrap/bin/ghc' \
+ --with-gcc=${configure.cc}
build {
system "cd ${worksrcpath} && env DYLD_FALLBACK_LIBRARY_PATH=${prefix}/lib ${build.cmd}"
Modified: trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff 2009-07-12 13:56:36 UTC (rev 53707)
+++ trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff 2009-07-12 14:05:33 UTC (rev 53708)
@@ -1,35 +1,26 @@
---- libraries/Makefile.sav 2009-07-11 07:45:47.000000000 -0400
-+++ libraries/Makefile 2009-07-11 07:48:08.000000000 -0400
+--- libraries/Makefile.sav 2009-07-12 08:29:14.000000000 -0400
++++ libraries/Makefile 2009-07-12 08:34:34.000000000 -0400
@@ -141,19 +141,19 @@
bootstrapping.conf: cabal-bin
echo "[]" > $@.tmp
-cd extensible-exceptions && $(CABAL) clean --distpref=dist-bootstrapping
- cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+ cd extensible-exceptions && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++ cd extensible-exceptions && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
cd extensible-exceptions && $(CABAL) build --distpref=dist-bootstrapping
cd extensible-exceptions && $(CABAL) install --distpref=dist-bootstrapping --inplace
-cd filepath && $(CABAL) clean --distpref=dist-bootstrapping
- cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+ cd filepath && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++ cd filepath && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
cd filepath && $(CABAL) build --distpref=dist-bootstrapping
cd filepath && $(CABAL) install --distpref=dist-bootstrapping --inplace
-cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping
- cd Cabal && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+ cd Cabal && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++ cd Cabal && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
cd Cabal && $(CABAL) build --distpref=dist-bootstrapping
cd Cabal && $(CABAL) install --distpref=dist-bootstrapping --inplace
-cd hpc && $(CABAL) clean --distpref=dist-bootstrapping
- cd hpc && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+ cd hpc && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --with-hsc2hs=XXPATH_TO_HSC2HSXX --package-db=$(HERE_ABS)/$@.tmp
++ cd hpc && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --with-hc-pkg=$(GHC_PKG) --with-hsc2hs=XXPATH_TO_HSC2HSXX --package-db=$(HERE_ABS)/$@.tmp
cd hpc && $(CABAL) build --distpref=dist-bootstrapping
cd hpc && $(CABAL) install --distpref=dist-bootstrapping --inplace
mv $@.tmp $@
-@@ -217,7 +217,7 @@
- stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin
- -$(RM) -f stamp/configure.library.*.$* $*/unbuildable
- $(MKDIRHIER) `dirname $@`
-- ( cd $* && $(CABAL) configure $(ALL_CONFIGURE_FLAGS) ) \
-+ ( cd $* && $(CABAL) --verbose=3 configure $(ALL_CONFIGURE_FLAGS) ) \
- && touch $@ || touch $*/unbuildable
- # We don't touch $@ if configure failed as we would prefer to try
- # configuring it next time round, rather than assuming it'll still fail.
Modified: trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff 2009-07-12 13:56:36 UTC (rev 53707)
+++ trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff 2009-07-12 14:05:33 UTC (rev 53708)
@@ -1,11 +1,26 @@
---- libraries/Makefile.sav 2009-05-19 11:46:49.000000000 -0400
-+++ libraries/Makefile 2009-05-19 11:47:02.000000000 -0400
-@@ -153,7 +153,7 @@
+--- libraries/Makefile.sav 2009-07-12 08:29:14.000000000 -0400
++++ libraries/Makefile 2009-07-12 08:32:37.000000000 -0400
+@@ -141,19 +141,19 @@
+ bootstrapping.conf: cabal-bin
+ echo "[]" > $@.tmp
+ -cd extensible-exceptions && $(CABAL) clean --distpref=dist-bootstrapping
+- cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++ cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+ cd extensible-exceptions && $(CABAL) build --distpref=dist-bootstrapping
+ cd extensible-exceptions && $(CABAL) install --distpref=dist-bootstrapping --inplace
+ -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping
+- cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++ cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+ cd filepath && $(CABAL) build --distpref=dist-bootstrapping
+ cd filepath && $(CABAL) install --distpref=dist-bootstrapping --inplace
+ -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping
+- cd Cabal && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++ cd Cabal && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
cd Cabal && $(CABAL) build --distpref=dist-bootstrapping
cd Cabal && $(CABAL) install --distpref=dist-bootstrapping --inplace
-cd hpc && $(CABAL) clean --distpref=dist-bootstrapping
- cd hpc && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+ cd hpc && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --with-hsc2hs=XXPATH_TO_HSC2HSXX --package-db=$(HERE_ABS)/$@.tmp
++ cd hpc && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --with-hc-pkg=$(GHC_PKG) --with-hsc2hs=XXPATH_TO_HSC2HSXX --package-db=$(HERE_ABS)/$@.tmp
cd hpc && $(CABAL) build --distpref=dist-bootstrapping
cd hpc && $(CABAL) install --distpref=dist-bootstrapping --inplace
mv $@.tmp $@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090712/36bce2ed/attachment.html>
More information about the macports-changes
mailing list