[56583] trunk/dports/lang/ghc
gwright at macports.org
gwright at macports.org
Sun Aug 30 08:59:58 PDT 2009
Revision: 56583
http://trac.macports.org/changeset/56583
Author: gwright at macports.org
Date: 2009-08-30 08:59:57 -0700 (Sun, 30 Aug 2009)
Log Message:
-----------
Version bump to 6.10.4; fix build with autoconf 2.64 (tested with both
2.63 and 2.64); make the build respect the ${configure.cc} variable.
Modified Paths:
--------------
trunk/dports/lang/ghc/Portfile
trunk/dports/lang/ghc/files/patch-aclocal.m4.diff
trunk/dports/lang/ghc/files/patch-compiler-Makefile-debug.diff
trunk/dports/lang/ghc/files/patch-configure.ac.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-libraries-Makefile.diff
trunk/dports/lang/ghc/files/patch-mk-cabal.mk-debug.diff
Added Paths:
-----------
trunk/dports/lang/ghc/files/patch-compiler-Makefile.diff
trunk/dports/lang/ghc/files/patch-compiler-Makefile.local.diff
trunk/dports/lang/ghc/files/patch-ghc-Makefile.diff
trunk/dports/lang/ghc/files/patch-libraries-cabal-bin.hs.diff
trunk/dports/lang/ghc/files/patch-libraries-terminfo-configure.ac.diff
trunk/dports/lang/ghc/files/patch-mk-cabal.mk.diff
trunk/dports/lang/ghc/files/patch-mk-target.mk.diff
trunk/dports/lang/ghc/files/patch-utils-genapply-Makefile.diff
trunk/dports/lang/ghc/files/patch-utils-genprimopcode-Makefile.diff
Removed Paths:
-------------
trunk/dports/lang/ghc/files/patch-runProcess.c.diff
Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile 2009-08-30 15:53:51 UTC (rev 56582)
+++ trunk/dports/lang/ghc/Portfile 2009-08-30 15:59:57 UTC (rev 56583)
@@ -4,8 +4,7 @@
name ghc
set canonicalname ghc
-version 6.10.3
-revision 7
+version 6.10.4
categories lang haskell
maintainers gwright
platforms darwin
@@ -33,17 +32,17 @@
testsuite-${version}.tar.bz2
checksums ${canonicalname}-${version}-src.tar.bz2 \
- md5 3de6a6d434c2b43def10c4cc613b265e \
- sha1 598bef94c99011a4f6791b8fbb7153ba7dffaf92 \
- rmd160 90b01fefd474a64cf6b6b507f224abf6250745d3 \
+ md5 167687fa582ef6702aaac24e139ec982 \
+ sha1 0566858b409066d98da70de5adb9a7030d0df5dc \
+ rmd160 5f83baf2549f1f4bea140c6a80728c2a76f60ab6 \
${canonicalname}-${version}-src-extralibs.tar.bz2 \
- md5 d0fe09625556ea274df11d601c1b2a15 \
- sha1 4c208e0d4e604b39bcd7da753183a9f259408864 \
- rmd160 7a0b46f9934f154fc897fcd44f7f79d4d98c1e94 \
+ md5 37ce285617d7cebabc3cf6805bdbca25 \
+ sha1 b08b26070f2965122662d035c602536ae9aafbb8 \
+ rmd160 78e6dba88a253095c79f94c5356918402810bd01 \
testsuite-${version}.tar.bz2 \
- md5 8db949b5bca633b665952daaf2c4ad1c \
- sha1 f857e5642f1beda71d0f96d96e02c45d953edd23 \
- rmd160 723b12fed8250647ceaf89233153765a09a7b743 \
+ md5 1973d7c1a24afbc58cebc7c574ebb56f \
+ sha1 cfb327686398fba2c12a5cd1fdad56faa4fbf3c6 \
+ rmd160 8952dda913a6363f60d3c4ad2d18ec6abcf33425 \
# ghc does not support a universal build:
universal_variant no
@@ -54,9 +53,18 @@
patchfiles patch-configure.ac.diff \
patch-aclocal.m4.diff \
patch-compiler-ghc.cabal.in.diff \
+ patch-compiler-Makefile.diff \
+ patch-compiler-Makefile.local.diff \
+ patch-ghc-Makefile.diff \
patch-libraries-Makefile.diff \
- patch-runProcess.c.diff
+ patch-libraries-cabal-bin.hs.diff \
+ patch-libraries-terminfo-configure.ac.diff \
+ patch-mk-cabal.mk.diff \
+ patch-mk-target.mk.diff \
+ patch-utils-genapply-Makefile.diff \
+ patch-utils-genprimopcode-Makefile.diff
+depends_build port:autoconf
depends_lib port:gmp \
port:ncursesw \
port:libiconv
@@ -67,7 +75,10 @@
patch-libraries-Makefile-debug.diff \
patch-mk-cabal.mk-debug.diff
- patchfiles-delete patch-libraries-Makefile.diff
+ patchfiles-delete patch-compiler-Makefile.diff \
+ patch-ghc-Makefile.diff \
+ patch-libraries-Makefile.diff \
+ patch-mk-cabal.mk.diff
}
# Yes, it some situations (-fvia-C) we really need perl
@@ -89,6 +100,13 @@
}
+platform darwin 10 {
+ pre-fetch {
+ return -code error "${canonicalname} is not yet supported on Mac OS X 10.7.x (SnowLeopard)"
+ }
+}
+
+
platform darwin 8 powerpc {
global ghc_bootversion
set ghc_bootversion 6.10.1
@@ -194,12 +212,21 @@
post-extract {
- system "tar jxf ${distpath}/testsuite-${version}.tar.bz2 -C ${worksrcpath}"
+ system "tar jxf ${distpath}/testsuite-${version}.tar.bz2 -C ${worksrcpath}"
}
post-patch {
- reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|" ${worksrcpath}/libraries/Makefile
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/ghc/Makefile
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/compiler/Makefile
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/compiler/Makefile.local
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/libraries/Makefile
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/libraries/cabal-bin.hs
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/aclocal.m4
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/mk/cabal.mk
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/mk/target.mk
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/utils/genapply/Makefile
+ reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/utils/genprimopcode/Makefile
reinplace "s|XXPATH_TO_HSC2HSXX|${workpath}/ghc-bootstrap/bin/hsc2hs|" ${worksrcpath}/libraries/Makefile
@@ -222,7 +249,7 @@
pre-configure {
- system "autoreconf ${worksrcpath}"
+ system "${prefix}/bin/autoreconf ${worksrcpath}"
set cfg [open "${workpath}/ghc-bootstrap/bin/ghc-pkg" w]
puts $cfg "#!/bin/sh"
@@ -264,6 +291,9 @@
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"
+ if {[variant_isset cabal_configure_debug]} then {
+ puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --verbose=3"
+ }
close $cfg
}
@@ -285,7 +315,7 @@
--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 {
Modified: trunk/dports/lang/ghc/files/patch-aclocal.m4.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-aclocal.m4.diff 2009-08-30 15:53:51 UTC (rev 56582)
+++ trunk/dports/lang/ghc/files/patch-aclocal.m4.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -1,6 +1,109 @@
---- aclocal.m4.sav 2009-05-19 11:44:21.000000000 -0400
-+++ aclocal.m4 2009-05-19 11:44:38.000000000 -0400
-@@ -805,7 +805,7 @@
+--- aclocal.m4.sav 2009-08-29 16:29:02.000000000 -0400
++++ aclocal.m4 2009-08-29 16:29:51.000000000 -0400
+@@ -194,29 +194,6 @@
+ AS_IF([test "$fp_num1" $2 "$fp_num2"], [$4], [$5])[]dnl
+ ])# FP_COMPARE_VERSIONS
+
+-
+-dnl
+-dnl Check for GreenCard and version.
+-dnl
+-AC_DEFUN([FPTOOLS_GREENCARD],
+-[
+-AC_PATH_PROG(GreenCardCmd,greencard)
+-AC_CACHE_CHECK([for version of greencard], fptools_cv_greencard_version,
+-changequote(, )dnl
+-[if test x"$GreenCardCmd" != x; then
+- fptools_cv_greencard_version="`$GreenCardCmd --version |
+- grep 'version' | sed -e 's/greencard. version \([^ ]*\).*/\1/g'`"
+-else
+- fptools_cv_greencard_version=""
+-fi
+-changequote([, ])dnl
+-])
+-FP_COMPARE_VERSIONS([$fptools_cv_greencard_version],[-lt],[$1],
+- [AC_MSG_ERROR([greencard version $1 or later is required (found '$fptools_cv_greencard_version')])])[]dnl
+-GreenCardVersion=$fptools_cv_greencard_version
+-AC_SUBST(GreenCardVersion)
+-])
+-
+ dnl
+ dnl Check for Happy and version. If we're building GHC, then we need
+ dnl at least Happy version 1.14. If there's no installed Happy, we look
+@@ -237,8 +214,8 @@
+ AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
+ changequote(, )dnl
+ [if test x"$HappyCmd" != x; then
+- fptools_cv_happy_version="`$HappyCmd -v |
+- grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'`" ;
++ fptools_cv_happy_version=`"$HappyCmd" -v |
++ grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'` ;
+ else
+ fptools_cv_happy_version="";
+ fi;
+@@ -247,7 +224,7 @@
+ if test ! -f compiler/parser/Parser.hs || test ! -f compiler/main/ParsePkgConf.hs || test ! -f compiler/cmm/CmmParse.hs || test ! -f compiler/parser/ParserCore.hs
+ then
+ FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.15],
+- [AC_MSG_ERROR([Happy version 1.15 or later is required to compile GHC.])])[]dnl
++ [AC_MSG_ERROR([Happy version 1.15 or later is required to compile GHC.])])[]
+ fi
+ HappyVersion=$fptools_cv_happy_version;
+ AC_SUBST(HappyVersion)
+@@ -272,8 +249,8 @@
+ AC_CACHE_CHECK([for version of alex], fptools_cv_alex_version,
+ changequote(, )dnl
+ [if test x"$AlexCmd" != x; then
+- fptools_cv_alex_version="`$AlexCmd -v |
+- grep 'Alex [Vv]ersion' | sed -e 's/Alex [Vv]ersion \([0-9\.]*\).*/\1/g'`" ;
++ fptools_cv_alex_version=`"$AlexCmd" -v |
++ grep 'Alex [Vv]ersion' | sed -e 's/Alex [Vv]ersion \([0-9\.]*\).*/\1/g'` ;
+ else
+ fptools_cv_alex_version="";
+ fi;
+@@ -282,7 +259,7 @@
+ if test ! -f compiler/cmm/CmmLex.hs || test ! -f compiler/parser/Lexer.hs
+ then
+ FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.1.0],
+- [AC_MSG_ERROR([Alex version 2.1.0 or later is required to compile GHC.])])[]dnl
++ [AC_MSG_ERROR([Alex version 2.1.0 or later is required to compile GHC.])])[]
+ fi
+ AlexVersion=$fptools_cv_alex_version;
+ AC_SUBST(AlexVersion)
+@@ -518,17 +495,17 @@
+ if test "$fp_have_gcc" = "NO" -a -d $srcdir/ghc; then
+ AC_MSG_ERROR([gcc is required])
+ fi
+-AC_CACHE_CHECK([version of gcc], [fp_gcc_version],
++AC_CACHE_CHECK([version of gcc], [fp_cv_gcc_version],
+ [if test "$fp_have_gcc" = "YES"; then
+- fp_gcc_version="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9.]]*\).*/\1/g'`"
+- FP_COMPARE_VERSIONS([$fp_gcc_version], [-lt], [2.0],
+- [AC_MSG_ERROR([Need at least gcc version 2.0 (3.4+ recommended)])])
++ fp_cv_gcc_version="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9.]]*\).*/\1/g'`"
++ FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-lt], [3.0],
++ [AC_MSG_ERROR([Need at least gcc version 3.0 (3.4+ recommended)])])
+ else
+- fp_gcc_version="not-installed"
++ fp_cv_gcc_version="not-installed"
+ fi
+ ])
+ AC_SUBST([HaveGcc], [$fp_have_gcc])
+-AC_SUBST([GccVersion], [$fp_gcc_version])
++AC_SUBST([GccVersion], [$fp_cv_gcc_version])
+ ])# FP_HAVE_GCC
+
+ AC_DEFUN([FP_MINGW_GCC],
+@@ -785,7 +762,7 @@
+ if test -n "$XmllintCmd"; then
+ AC_MSG_CHECKING([for DocBook DTD])
+ FP_GEN_DOCBOOK_XML
+- if $XmllintCmd --valid --noout conftest.xml > /dev/null 2>&1; then
++ if $XmllintCmd --nonet --valid --noout conftest.xml ; then
+ AC_MSG_RESULT([ok])
+ else
+ AC_MSG_RESULT([failed])
+@@ -805,7 +782,7 @@
AC_DEFUN([FP_PROG_GHC_PKG],
[AC_CACHE_CHECK([for ghc-pkg matching $WithGhc], fp_cv_matching_ghc_pkg,
[fp_ghc_pkg_guess=`echo $WithGhc | sed 's,ghc\(@<:@^/\\@:>@*\)$,ghc-pkg\1,'`
@@ -9,3 +112,41 @@
fp_cv_matching_ghc_pkg=$fp_ghc_pkg_guess
elif "$fp_ghc_pkg_guess" list > /dev/null 2>&1; then
# from 6.10, ghc-pkg doesn't support the old -l syntax any more
+@@ -841,23 +818,23 @@
+ [AC_REQUIRE([FP_HAVE_GCC])
+ AC_CACHE_CHECK([for extra options to pass gcc when compiling via C], [fp_cv_gcc_extra_opts],
+ [fp_cv_gcc_extra_opts=
+- FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [3.4],
++ FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [3.4],
+ [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fwrapv"],
+ [])
+ case $TargetPlatform in
+ i386-*|x86_64-*)
+- FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [3.2],
++ FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [3.2],
+ [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -mno-omit-leaf-frame-pointer"],
+ [])
+- FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [3.4],
+- [FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [4.2],
++ FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [3.4],
++ [FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [4.2],
+ [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fno-toplevel-reorder"],
+ [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fno-unit-at-a-time"]
+ )],
+ [])
+ ;;
+ sparc-*-solaris2)
+- FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [4.2],
++ FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [4.2],
+ [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fno-toplevel-reorder"],
+ [])
+ ;;
+@@ -1128,7 +1105,7 @@
+ rm -f *.hi
+ rm -f pwd
+ rm -f pwd.exe
+- $WithGhc -v0 --make pwd -o pwd
++ $WithGhc -v0 -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX --make pwd -o pwd
+ cd ../..
+ fi
+
Modified: trunk/dports/lang/ghc/files/patch-compiler-Makefile-debug.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-compiler-Makefile-debug.diff 2009-08-30 15:53:51 UTC (rev 56582)
+++ trunk/dports/lang/ghc/files/patch-compiler-Makefile-debug.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -1,6 +1,6 @@
---- 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 @@
+--- compiler/Makefile.sav 2009-08-27 08:09:21.000000000 -0400
++++ compiler/Makefile 2009-08-27 08:16:20.000000000 -0400
+@@ -186,10 +186,14 @@
boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) $(PARSER_Y)
test -f $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
@@ -9,3 +9,10 @@
$(CONFIGURE_FLAGS_STAGE$*) \
$(INSTALL_DIRS_CONFIGURE_FLAGS) \
$(COMMON_CONFIGURE_FLAGS) \
++ --ghc-option='-pgmP "XXPATH_TO_GCCXX -E -undef -traditional"' \
++ --ghc-option='-pgmc XXPATH_TO_GCCXX' \
++ --ghc-option='-pgml XXPATH_TO_GCCXX' \
++ --ghc-option='-pgma XXPATH_TO_GCCXX' \
+ --ghc-option=-DSTAGE=$*
+ $(RM) -f Makefile-stage$*
+ $(CABAL) makefile --distpref dist-stage$* -f Makefile-stage$*
Added: trunk/dports/lang/ghc/files/patch-compiler-Makefile.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-compiler-Makefile.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-compiler-Makefile.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -0,0 +1,13 @@
+--- compiler/Makefile.sav 2009-08-27 08:09:21.000000000 -0400
++++ compiler/Makefile 2009-08-27 08:17:36.000000000 -0400
+@@ -190,6 +190,10 @@
+ $(CONFIGURE_FLAGS_STAGE$*) \
+ $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+ $(COMMON_CONFIGURE_FLAGS) \
++ --ghc-option='-pgmP "XXPATH_TO_GCCXX -E -undef -traditional"' \
++ --ghc-option='-pgmc XXPATH_TO_GCCXX' \
++ --ghc-option='-pgml XXPATH_TO_GCCXX' \
++ --ghc-option='-pgma XXPATH_TO_GCCXX' \
+ --ghc-option=-DSTAGE=$*
+ $(RM) -f Makefile-stage$*
+ $(CABAL) makefile --distpref dist-stage$* -f Makefile-stage$*
Added: trunk/dports/lang/ghc/files/patch-compiler-Makefile.local.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-compiler-Makefile.local.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-compiler-Makefile.local.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -0,0 +1,13 @@
+--- compiler/Makefile.local.sav 2009-08-25 10:58:22.000000000 -0400
++++ compiler/Makefile.local 2009-08-25 11:42:30.000000000 -0400
+@@ -19,6 +19,10 @@
+ GHC_CC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+ GHC_OPTS += $(SRC_HC_OPTS)
+ GHC_OPTS += $(GhcHcOpts)
++GHC_CC_OPTS += -pgmP "XXPATH_TO_GCCXX -E -undef -traditional"
++GHC_CC_OPTS += -pgma XXPATH_TO_GCCXX
++GHC_CC_OPTS += -pgmc XXPATH_TO_GCCXX
++GHC_CC_OPTS += -pgml XXPATH_TO_GCCXX
+ GHC_OPTS += $(GhcStage$(stage)HcOpts)
+ GHC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+ LIB_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
Modified: trunk/dports/lang/ghc/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-configure.ac.diff 2009-08-30 15:53:51 UTC (rev 56582)
+++ trunk/dports/lang/ghc/files/patch-configure.ac.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -1,7 +1,32 @@
---- configure.ac.sav 2009-05-19 11:45:21.000000000 -0400
-+++ configure.ac 2009-05-19 11:45:35.000000000 -0400
-@@ -1138,19 +1138,19 @@
+--- configure.ac.sav 2009-08-29 16:28:58.000000000 -0400
++++ configure.ac 2009-08-29 16:30:11.000000000 -0400
+@@ -795,7 +795,7 @@
+ AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
+ fi
+ FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.4],
+- [AC_MSG_ERROR([GHC version 6.4 or later is required to compile GHC.])])dnl
++ [AC_MSG_ERROR([GHC version 6.4 or later is required to compile GHC.])])
+ fi;
+ # This uses GHC, so put it after the "GHC is required" check above:
+@@ -987,15 +987,6 @@
+ dnl ** check for ghc-pkg command
+ FP_PROG_GHC_PKG
+
+-AC_ARG_WITH(greencard,
+-[AC_HELP_STRING([--with-greencard=ARG],
+- [Use ARG as the path to greencard [default=autodetct]])],
+-[
+-GreenCardCmd=$withval;
+-FPTOOLS_GREENCARD(3.00)
+-]
+-)
+-
+ dnl ** check for installed happy binary + version
+ dnl (don't do it if we're booting from .hc files though.)
+ if test "$BootingFromHc" = "NO"; then
+@@ -1138,19 +1129,19 @@
+
dnl ** (Mac OS X only: check for GMP.framework)
HaveFrameworkGMP=NO
-case $HostPlatform in
Modified: trunk/dports/lang/ghc/files/patch-ghc-Makefile-debug.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-ghc-Makefile-debug.diff 2009-08-30 15:53:51 UTC (rev 56582)
+++ trunk/dports/lang/ghc/files/patch-ghc-Makefile-debug.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -1,6 +1,6 @@
---- 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 @@
+--- ghc/Makefile.sav 2009-08-27 08:20:43.000000000 -0400
++++ ghc/Makefile 2009-08-27 08:21:06.000000000 -0400
+@@ -108,10 +108,14 @@
dist-stage1 dist-stage2 dist-stage3: dist-stage%: boot.stage.%
boot.stage.%:
@@ -9,3 +9,10 @@
$(INSTALL_DIRS_CONFIGURE_FLAGS) \
$(CONFIGURE_FLAGS_STAGE$*) \
$(COMMON_CONFIGURE_FLAGS) \
++ --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' \
++ --ghc-option='-pgmc XXPATH_TO_GCCXX' \
++ --ghc-option='-pgml XXPATH_TO_GCCXX' \
++ --ghc-option='-pgma XXPATH_TO_GCCXX' \
+ --libsubdir=. \
+ --datadir='$$libdir' \
+ --datasubdir=.
Added: trunk/dports/lang/ghc/files/patch-ghc-Makefile.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-ghc-Makefile.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-ghc-Makefile.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -0,0 +1,13 @@
+--- ghc/Makefile.sav 2009-08-27 08:20:43.000000000 -0400
++++ ghc/Makefile 2009-08-27 08:23:28.000000000 -0400
+@@ -112,6 +112,10 @@
+ $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+ $(CONFIGURE_FLAGS_STAGE$*) \
+ $(COMMON_CONFIGURE_FLAGS) \
++ --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' \
++ --ghc-option='-pgmc XXPATH_TO_GCCXX' \
++ --ghc-option='-pgml XXPATH_TO_GCCXX' \
++ --ghc-option='-pgma XXPATH_TO_GCCXX' \
+ --libsubdir=. \
+ --datadir='$$libdir' \
+ --datasubdir=.
Modified: trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff 2009-08-30 15:53:51 UTC (rev 56582)
+++ trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -1,26 +1,44 @@
---- libraries/Makefile.sav 2009-07-12 08:29:14.000000000 -0400
-+++ libraries/Makefile 2009-07-12 08:34:34.000000000 -0400
+--- libraries/Makefile.sav 2009-08-27 08:24:39.000000000 -0400
++++ libraries/Makefile 2009-08-27 08:25:20.000000000 -0400
+@@ -123,7 +123,7 @@
+
+ HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
+
+-CABAL_GHC_FLAGS = -Wall
++CABAL_GHC_FLAGS = -v3 -Wall -pgmP "XXPATH_TO_GCCXX -E -undef -traditional" -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX
+ ifeq "$(ghc_ge_605)" "NO"
+ CABAL_GHC_FLAGS += -cpp
+ endif
@@ -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-gcc=XXPATH_TO_GCCXX --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 --ghc-options='$(CABAL_GHC_FLAGS)' --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-gcc=XXPATH_TO_GCCXX --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 --ghc-options='$(CABAL_GHC_FLAGS)' --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-gcc=XXPATH_TO_GCCXX --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 --ghc-options='$(CABAL_GHC_FLAGS)' --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-gcc=XXPATH_TO_GCCXX --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 --ghc-options='$(CABAL_GHC_FLAGS)' --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 $@
+@@ -165,7 +165,7 @@
+ ifeq "$(stage)" "2"
+ cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
+ else
+- cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
++ cd ifBuildable && $(GHC) -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX -Wall --make ifBuildable -o ifBuildable
+ endif
+
+ .PHONY: all build configure
Modified: trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff 2009-08-30 15:53:51 UTC (rev 56582)
+++ trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -1,26 +1,44 @@
---- libraries/Makefile.sav 2009-07-12 08:29:14.000000000 -0400
-+++ libraries/Makefile 2009-07-12 08:32:37.000000000 -0400
+--- libraries/Makefile.sav 2009-08-27 08:24:39.000000000 -0400
++++ libraries/Makefile 2009-08-27 08:29:44.000000000 -0400
+@@ -123,7 +123,7 @@
+
+ HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
+
+-CABAL_GHC_FLAGS = -Wall
++CABAL_GHC_FLAGS = -Wall -pgmP "XXPATH_TO_GCCXX -E -undef -traditional" -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX
+ ifeq "$(ghc_ge_605)" "NO"
+ CABAL_GHC_FLAGS += -cpp
+ endif
@@ -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) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --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) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --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) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --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-gcc=XXPATH_TO_GCCXX --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 --ghc-options='$(CABAL_GHC_FLAGS)' --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 $@
+@@ -165,7 +165,7 @@
+ ifeq "$(stage)" "2"
+ cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
+ else
+- cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
++ cd ifBuildable && $(GHC) -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX -Wall --make ifBuildable -o ifBuildable
+ endif
+
+ .PHONY: all build configure
Added: trunk/dports/lang/ghc/files/patch-libraries-cabal-bin.hs.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-cabal-bin.hs.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-cabal-bin.hs.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -0,0 +1,13 @@
+--- libraries/cabal-bin.hs.sav 2009-08-26 15:29:20.000000000 -0400
++++ libraries/cabal-bin.hs 2009-08-26 15:30:51.000000000 -0400
+@@ -53,6 +53,10 @@
+ unless cleaning $
+ rawSystemExit verbosity ghc ["-package-conf", packageConf,
+ "--make", "Setup",
++ "-pgmP", "XXPATH_TO_GCCXX -E -undef -traditional",
++ "-pgmc", "XXPATH_TO_GCCXX",
++ "-pgml", "XXPATH_TO_GCCXX",
++ "-pgma", "XXPATH_TO_GCCXX",
+ "-package", "Cabal-" ++ useCabalVersion,
+ "-o", "Setup"]
+ rawSystemExit verbosity "./Setup" args
Added: trunk/dports/lang/ghc/files/patch-libraries-terminfo-configure.ac.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-terminfo-configure.ac.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-terminfo-configure.ac.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -0,0 +1,15 @@
+--- libraries/terminfo/configure.ac.sav 2009-08-28 08:46:45.000000000 -0400
++++ libraries/terminfo/configure.ac 2009-08-28 08:47:27.000000000 -0400
+@@ -40,9 +40,9 @@
+ fi
+
+ AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
+- AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
+- AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
+- HaveLibCurses=NO; LibCurses=not-installed)))
++ [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
++ [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
++ HaveLibCurses=NO; LibCurses=not-installed)])])
+
+ if test "x$HaveLibCurses" = "xNO" ; then
+ AC_MSG_FAILURE([curses library not found, so this package cannot be built])
Modified: trunk/dports/lang/ghc/files/patch-mk-cabal.mk-debug.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-mk-cabal.mk-debug.diff 2009-08-30 15:53:51 UTC (rev 56582)
+++ trunk/dports/lang/ghc/files/patch-mk-cabal.mk-debug.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -1,15 +1,22 @@
---- 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 @@
+--- mk/cabal.mk.sav 2009-07-19 14:46:18.000000000 -0400
++++ mk/cabal.mk 2009-07-19 14:46:50.000000000 -0400
+@@ -25,17 +25,21 @@
+
default all: with-bootstrapping-compiler
++CABAL_GHC_MACPORTS_FLAGS = --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' --ghc-option='-pgmc XXPATH_TO_GCCXX' --ghc-option='-pgml XXPATH_TO_GCCXX' --ghc-option='-pgma XXPATH_TO_GCCXX'
++
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_GHC_MACPORTS_FLAGS) \
+ $(EXTRA_INPLACE_CONFIGURE_FLAGS)
+- $(CABAL) build --distpref dist-inplace $(BUILD_FLAGS)
++ $(CABAL) build --verbose=3 --distpref dist-inplace \
++ $(BUILD_FLAGS)
$(CABAL) install --distpref dist-inplace $(INSTALL_FLAGS)
with-stage-2:
Added: trunk/dports/lang/ghc/files/patch-mk-cabal.mk.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-mk-cabal.mk.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-mk-cabal.mk.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -0,0 +1,27 @@
+--- mk/cabal.mk.sav 2009-08-27 08:31:02.000000000 -0400
++++ mk/cabal.mk 2009-08-27 08:33:16.000000000 -0400
+@@ -25,17 +25,21 @@
+
+ default all: with-bootstrapping-compiler
+
++CABAL_GHC_MACPORTS_FLAGS = --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' --ghc-option='-pgmc XXPATH_TO_GCCXX' --ghc-option='-pgml XXPATH_TO_GCCXX' --ghc-option='-pgma XXPATH_TO_GCCXX'
++
+ with-bootstrapping-compiler:
+- $(CABAL) configure --distpref dist-inplace \
++ $(CABAL) configure --distpref dist-inplace \
+ $(INPLACE_DIRS_CONFIGURE_FLAGS) \
+ $(USE_BOOT_CONFIGURE_FLAGS) \
+ $(COMMON_CONFIGURE_FLAGS) \
++ $(CABAL_GHC_MACPORTS_FLAGS) \
+ $(EXTRA_INPLACE_CONFIGURE_FLAGS)
+- $(CABAL) build --distpref dist-inplace $(BUILD_FLAGS)
++ $(CABAL) build --distpref dist-inplace \
++ $(BUILD_FLAGS)
+ $(CABAL) install --distpref dist-inplace $(INSTALL_FLAGS)
+
+ with-stage-2:
+- $(CABAL) configure --distpref dist-install \
++ $(CABAL) configure --distpref dist-install \
+ $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+ $(USE_STAGE2_CONFIGURE_FLAGS) \
+ $(COMMON_CONFIGURE_FLAGS) \
Added: trunk/dports/lang/ghc/files/patch-mk-target.mk.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-mk-target.mk.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-mk-target.mk.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -0,0 +1,11 @@
+--- mk/target.mk.sav 2009-07-20 01:55:01.000000000 -0400
++++ mk/target.mk 2009-07-20 01:56:42.000000000 -0400
+@@ -86,7 +86,7 @@
+ ifeq "$(USE_NEW_MKDEPEND_FLAGS)" "YES"
+ MKDEPENDHS_FLAGS = -dep-makefile .depend $(foreach way,$(WAYS),-dep-suffix $(way))
+ else
+-MKDEPENDHS_FLAGS = -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way))
++MKDEPENDHS_FLAGS = -optdep-f -optdep.depend -pgmP "XXPATH_TO_GCCXX -E -undef -traditional" -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX $(foreach way,$(WAYS),-optdep-s -optdep$(way))
+ endif
+
+ depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(PKGCONF_DEP)
Deleted: trunk/dports/lang/ghc/files/patch-runProcess.c.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-runProcess.c.diff 2009-08-30 15:53:51 UTC (rev 56582)
+++ trunk/dports/lang/ghc/files/patch-runProcess.c.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -1,23 +0,0 @@
---- libraries/process/cbits/runProcess.c.sav 2009-06-21 10:31:51.000000000 -0400
-+++ libraries/process/cbits/runProcess.c 2009-06-21 10:33:29.000000000 -0400
-@@ -63,10 +63,12 @@
- // shared between parent and child), and the parent behaves as if
- // the signal had been raised.
- blockUserSignals();
-+ stopTimer();
-
- switch(pid = fork())
- {
- case -1:
-+ startTimer();
- unblockUserSignals();
- if (fdStdIn == -1) {
- close(fdStdInput[0]);
-@@ -184,6 +186,7 @@
- }
- break;
- }
-+ startTimer();
- unblockUserSignals();
-
- return pid;
Added: trunk/dports/lang/ghc/files/patch-utils-genapply-Makefile.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-utils-genapply-Makefile.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-utils-genapply-Makefile.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -0,0 +1,14 @@
+--- utils/genapply/Makefile.sav 2009-07-27 08:37:49.000000000 -0400
++++ utils/genapply/Makefile 2009-07-27 08:39:01.000000000 -0400
+@@ -23,6 +23,11 @@
+ SRC_HC_OPTS += -no-recomp
+ endif
+
++SRC_HC_OPTS += -pgmP "XXPATH_TO_GCCXX -E -undef -traditional"
++SRC_HC_OPTS += -pgma XXPATH_TO_GCCXX
++SRC_HC_OPTS += -pgmc XXPATH_TO_GCCXX
++SRC_HC_OPTS += -pgml XXPATH_TO_GCCXX
++
+ GenApply.o : $(GHC_INCLUDE_DIR)/ghcconfig.h
+ GenApply.o : $(GHC_INCLUDE_DIR)/MachRegs.h
+ GenApply.o : $(GHC_INCLUDE_DIR)/Constants.h
Added: trunk/dports/lang/ghc/files/patch-utils-genprimopcode-Makefile.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-utils-genprimopcode-Makefile.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-utils-genprimopcode-Makefile.diff 2009-08-30 15:59:57 UTC (rev 56583)
@@ -0,0 +1,14 @@
+--- utils/genprimopcode/Makefile.sav 2009-07-27 09:00:59.000000000 -0400
++++ utils/genprimopcode/Makefile 2009-07-27 09:01:55.000000000 -0400
+@@ -3,6 +3,11 @@
+
+ HS_PROG = genprimopcode
+
++SRC_HC_OPTS += -pgmP "XXPATH_TO_GCCXX -E -undef -traditional"
++SRC_HC_OPTS += -pgma XXPATH_TO_GCCXX
++SRC_HC_OPTS += -pgmc XXPATH_TO_GCCXX
++SRC_HC_OPTS += -pgml XXPATH_TO_GCCXX
++
+ binary-dist:
+ @:
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090830/c0d22d9f/attachment-0001.html>
More information about the macports-changes
mailing list