[50673] trunk/dports/lang/ghc/files

gwright at macports.org gwright at macports.org
Wed May 6 12:31:12 PDT 2009


Revision: 50673
          http://trac.macports.org/changeset/50673
Author:   gwright at macports.org
Date:     2009-05-06 12:31:11 -0700 (Wed, 06 May 2009)
Log Message:
-----------
Forgot the new patch files for the update :-(
My bad.

Added Paths:
-----------
    trunk/dports/lang/ghc/files/patch-testsuite-mk-boilerplate.mk.diff
    trunk/dports/lang/ghc/files/patch-testsuite-timeout-Makefile.diff

Added: trunk/dports/lang/ghc/files/patch-testsuite-mk-boilerplate.mk.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-testsuite-mk-boilerplate.mk.diff	                        (rev 0)
+++ trunk/dports/lang/ghc/files/patch-testsuite-mk-boilerplate.mk.diff	2009-05-06 19:31:11 UTC (rev 50673)
@@ -0,0 +1,41 @@
+--- testsuite-6.10.2/mk/boilerplate.mk.sav	2009-04-03 09:33:32.000000000 -0400
++++ testsuite-6.10.2/mk/boilerplate.mk	2009-04-03 09:54:26.000000000 -0400
+@@ -53,6 +53,7 @@
+ OLD_BUILD_SYSTEM_STAGE2_GHC := $(abspath $(TOP)/../ghc/stage2-inplace/ghc)
+ OLD_BUILD_SYSTEM_STAGE3_GHC := $(abspath $(TOP)/../ghc/stage3-inplace/ghc)
+ OLD_BUILD_SYSTEM_GHC_PKG    := $(abspath $(TOP)/../utils/ghc-pkg/install-inplace/bin/ghc-pkg)
++OLD_BUILD_SYSTEM_HSC2HS     := $(abspath $(TOP)/../utils/hsc2hs/install-inplace/bin/hsc2hs)
+ OLD_BUILD_SYSTEM_HP2PS      := $(abspath $(TOP)/../utils/hp2ps/hp2ps)
+ ifneq "$(wildcard $(OLD_BUILD_SYSTEM_STAGE1_GHC) $(OLD_BUILD_SYSTEM_STAGE1_GHC).exe)" ""
+ 
+@@ -67,6 +68,7 @@
+ endif
+ endif
+ GHC_PKG := $(OLD_BUILD_SYSTEM_GHC_PKG)
++HSC2HS := $(OLD_BUILD_SYSTEM_HSC2HS)
+ HP2PS_ABS := $(OLD_BUILD_SYSTEM_HP2PS)
+ # XXX This GCC definition is a hack. Once the in-tree GHC has a gcc in the
+ # right place we won't need to do this, as Cabal will be able to find
+@@ -105,6 +107,10 @@
+ GHC_PKG := $(dir $(TEST_HC))/ghc-pkg
+ endif
+ 
++ifeq "$(HSC2HS)" ""
++HSC2HS := $(dir $(TEST_HC))/hsc2hs
++endif
++
+ ifeq "$(HP2PS_ABS)" ""
+ HP2PS_ABS := $(dir $(TEST_HC))/hp2ps
+ endif
+@@ -119,6 +125,11 @@
+ $(error Cannot find ghc-pkg: $(GHC_PKG))
+ endif
+ 
++$(eval $(call canonicaliseExecutable,HSC2HS))
++ifeq "$(wildcard $(HSC2HS))" ""
++$(error Cannot find ghc-pkg: $(HSC2HS))
++endif
++
+ $(eval $(call canonicaliseExecutable,HP2PS_ABS))
+ ifeq "$(wildcard $(HP2PS_ABS))" ""
+ $(error Cannot find hp2ps: $(HP2PS_ABS))

Added: trunk/dports/lang/ghc/files/patch-testsuite-timeout-Makefile.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-testsuite-timeout-Makefile.diff	                        (rev 0)
+++ trunk/dports/lang/ghc/files/patch-testsuite-timeout-Makefile.diff	2009-05-06 19:31:11 UTC (rev 50673)
@@ -0,0 +1,10 @@
+--- testsuite-6.10.2/timeout/Makefile.sav	2009-04-03 09:03:11.000000000 -0400
++++ testsuite-6.10.2/timeout/Makefile	2009-04-03 08:45:16.000000000 -0400
+@@ -32,6 +32,7 @@
+ 	$(TEST_HC) --make Setup
+ 	./Setup configure --with-compiler=$(TEST_HC) \
+ 	                  --with-hc-pkg=$(GHC_PKG) \
++			  --with-hsc2hs=$(HSC2HS) \
+ 	                  $(WITH_GCC) \
+ 	                  --ghc-option=-threaded --prefix=$(PREFIX)
+ 	./Setup build
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090506/b567ce82/attachment.html>


More information about the macports-changes mailing list