[53680] trunk/dports/lang/ghc
gwright at macports.org
gwright at macports.org
Sat Jul 11 12:01:52 PDT 2009
Revision: 53680
http://trac.macports.org/changeset/53680
Author: gwright at macports.org
Date: 2009-07-11 12:01:51 -0700 (Sat, 11 Jul 2009)
Log Message:
-----------
Add a variant (cabal_configure_debug) for debugging cabal problems, such
as those seen on Tiger/intel (Tiger/ppc seems OK).
Modified Paths:
--------------
trunk/dports/lang/ghc/Portfile
Added Paths:
-----------
trunk/dports/lang/ghc/files/patch-compiler-Makefile-debug.diff
trunk/dports/lang/ghc/files/patch-ghc-Makefile-debug.diff
trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff
trunk/dports/lang/ghc/files/patch-mk-cabal.mk-debug.diff
Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile 2009-07-11 18:53:11 UTC (rev 53679)
+++ trunk/dports/lang/ghc/Portfile 2009-07-11 19:01:51 UTC (rev 53680)
@@ -5,7 +5,7 @@
name ghc
set canonicalname ghc
version 6.10.3
-revision 3
+revision 4
categories lang haskell
maintainers gwright
platforms darwin
@@ -60,6 +60,15 @@
depends_lib port:libedit \
port:gmp
+variant cabal_configure_debug description {Add verbose debugging to cabal configure commands} {
+ patchfiles-append patch-compiler-Makefile-debug.diff \
+ patch-ghc-Makefile-debug.diff \
+ patch-libraries-Makefile-debug.diff \
+ patch-mk-cabal.mk-debug.diff
+
+ patchfiles-delete patch-libraries-Makefile.diff
+}
+
# Yes, it some situations (-fvia-C) we really need perl
# to _run_ ghc, since the mangler (an assembly to assembly transformation)
# is a perl script. That's why it called the "Evil Mangler".
Added: trunk/dports/lang/ghc/files/patch-compiler-Makefile-debug.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-compiler-Makefile-debug.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-compiler-Makefile-debug.diff 2009-07-11 19:01:51 UTC (rev 53680)
@@ -0,0 +1,11 @@
+--- compiler/Makefile.sav 2009-07-11 07:31:40.000000000 -0400
++++ compiler/Makefile 2009-07-11 07:32:02.000000000 -0400
+@@ -186,7 +186,7 @@
+
+ boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) $(PARSER_Y)
+ test -f $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
+- $(CABAL) configure --distpref dist-stage$* \
++ $(CABAL) configure --verbose=3 --distpref dist-stage$* \
+ $(CONFIGURE_FLAGS_STAGE$*) \
+ $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+ $(COMMON_CONFIGURE_FLAGS) \
Added: trunk/dports/lang/ghc/files/patch-ghc-Makefile-debug.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-ghc-Makefile-debug.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-ghc-Makefile-debug.diff 2009-07-11 19:01:51 UTC (rev 53680)
@@ -0,0 +1,11 @@
+--- ghc/Makefile.sav 2009-07-11 07:33:11.000000000 -0400
++++ ghc/Makefile 2009-07-11 07:33:43.000000000 -0400
+@@ -108,7 +108,7 @@
+ dist-stage1 dist-stage2 dist-stage3: dist-stage%: boot.stage.%
+
+ boot.stage.%:
+- $(CABAL) configure --distpref dist-stage$* \
++ $(CABAL) configure --verbose=3 --distpref dist-stage$* \
+ $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+ $(CONFIGURE_FLAGS_STAGE$*) \
+ $(COMMON_CONFIGURE_FLAGS) \
Added: trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff 2009-07-11 19:01:51 UTC (rev 53680)
@@ -0,0 +1,35 @@
+--- libraries/Makefile.sav 2009-07-11 07:45:47.000000000 -0400
++++ libraries/Makefile 2009-07-11 07:48:08.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) 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) 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) 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) 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.
Added: trunk/dports/lang/ghc/files/patch-mk-cabal.mk-debug.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-mk-cabal.mk-debug.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-mk-cabal.mk-debug.diff 2009-07-11 19:01:51 UTC (rev 53680)
@@ -0,0 +1,20 @@
+--- mk/cabal.mk.sav 2009-07-11 07:35:13.000000000 -0400
++++ mk/cabal.mk 2009-07-11 07:35:37.000000000 -0400
+@@ -26,7 +26,7 @@
+ default all: with-bootstrapping-compiler
+
+ with-bootstrapping-compiler:
+- $(CABAL) configure --distpref dist-inplace \
++ $(CABAL) configure --verbose=3 --distpref dist-inplace \
+ $(INPLACE_DIRS_CONFIGURE_FLAGS) \
+ $(USE_BOOT_CONFIGURE_FLAGS) \
+ $(COMMON_CONFIGURE_FLAGS) \
+@@ -35,7 +35,7 @@
+ $(CABAL) install --distpref dist-inplace $(INSTALL_FLAGS)
+
+ with-stage-2:
+- $(CABAL) configure --distpref dist-install \
++ $(CABAL) configure --verbose=3 --distpref dist-install \
+ $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+ $(USE_STAGE2_CONFIGURE_FLAGS) \
+ $(COMMON_CONFIGURE_FLAGS) \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090711/7546a48a/attachment.html>
More information about the macports-changes
mailing list