Changeset 53708


Ignore:
Timestamp:
Jul 12, 2009, 2:05:33 PM (10 years ago)
Author:
gwright@…
Message:

Revision 5 should fix #19856.

Location:
trunk/dports/lang/ghc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/ghc/Portfile

    r53680 r53708  
    66set canonicalname       ghc
    77version         6.10.3
    8 revision        4
     8revision        5
    99categories      lang haskell
    1010maintainers     gwright
     
    206206
    207207post-patch      {
     208                reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|" ${worksrcpath}/libraries/Makefile
     209
    208210                reinplace "s|XXPATH_TO_HSC2HSXX|${workpath}/ghc-bootstrap/bin/hsc2hs|" ${worksrcpath}/libraries/Makefile
    209211
     
    290292                --with-gmp-includes=${prefix}/include                   \
    291293                --with-gmp-libraries=${prefix}/lib                      \
    292                 --with-ghc='${workpath}/${canonicalname}-bootstrap/bin/ghc'
     294                --with-ghc='${workpath}/${canonicalname}-bootstrap/bin/ghc'     \
     295                --with-gcc=${configure.cc}
    293296
    294297build   {
  • trunk/dports/lang/ghc/files/patch-libraries-Makefile-debug.diff

    r53680 r53708  
    1 --- libraries/Makefile.sav      2009-07-11 07:45:47.000000000 -0400
    2 +++ libraries/Makefile  2009-07-11 07:48:08.000000000 -0400
     1--- libraries/Makefile.sav      2009-07-12 08:29:14.000000000 -0400
     2+++ libraries/Makefile  2009-07-12 08:34:34.000000000 -0400
    33@@ -141,19 +141,19 @@
    44 bootstrapping.conf: cabal-bin
     
    66        -cd extensible-exceptions && $(CABAL) clean     --distpref=dist-bootstrapping
    77-       cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
    8 +       cd extensible-exceptions && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
     8+       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
    99        cd extensible-exceptions && $(CABAL) build     --distpref=dist-bootstrapping
    1010        cd extensible-exceptions && $(CABAL) install   --distpref=dist-bootstrapping --inplace
    1111        -cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
    1212-       cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
    13 +       cd filepath && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
     13+       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
    1414        cd filepath && $(CABAL) build     --distpref=dist-bootstrapping
    1515        cd filepath && $(CABAL) install   --distpref=dist-bootstrapping --inplace
    1616        -cd Cabal    && $(CABAL) clean     --distpref=dist-bootstrapping
    1717-       cd Cabal    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
    18 +       cd Cabal    && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
     18+       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
    1919        cd Cabal    && $(CABAL) build     --distpref=dist-bootstrapping
    2020        cd Cabal    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
    2121        -cd hpc    && $(CABAL) clean     --distpref=dist-bootstrapping
    2222-       cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
    23 +       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
     23+       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
    2424        cd hpc    && $(CABAL) build     --distpref=dist-bootstrapping
    2525        cd hpc    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
    2626        mv $@.tmp $@
    27 @@ -217,7 +217,7 @@
    28  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin
    29         -$(RM) -f stamp/configure.library.*.$* $*/unbuildable
    30         $(MKDIRHIER) `dirname $@`
    31 -       ( cd $* && $(CABAL) configure $(ALL_CONFIGURE_FLAGS) ) \
    32 +       ( cd $* && $(CABAL) --verbose=3 configure $(ALL_CONFIGURE_FLAGS) ) \
    33               && touch $@ || touch $*/unbuildable
    34  # We don't touch $@ if configure failed as we would prefer to try
    35  # configuring it next time round, rather than assuming it'll still fail.
  • trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff

    r51205 r53708  
    1 --- libraries/Makefile.sav      2009-05-19 11:46:49.000000000 -0400
    2 +++ libraries/Makefile  2009-05-19 11:47:02.000000000 -0400
    3 @@ -153,7 +153,7 @@
     1--- libraries/Makefile.sav      2009-07-12 08:29:14.000000000 -0400
     2+++ libraries/Makefile  2009-07-12 08:32:37.000000000 -0400
     3@@ -141,19 +141,19 @@
     4 bootstrapping.conf: cabal-bin
     5        echo "[]" > $@.tmp
     6        -cd extensible-exceptions && $(CABAL) clean     --distpref=dist-bootstrapping
     7-       cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
     8+       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
     9        cd extensible-exceptions && $(CABAL) build     --distpref=dist-bootstrapping
     10        cd extensible-exceptions && $(CABAL) install   --distpref=dist-bootstrapping --inplace
     11        -cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
     12-       cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
     13+       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
     14        cd filepath && $(CABAL) build     --distpref=dist-bootstrapping
     15        cd filepath && $(CABAL) install   --distpref=dist-bootstrapping --inplace
     16        -cd Cabal    && $(CABAL) clean     --distpref=dist-bootstrapping
     17-       cd Cabal    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
     18+       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
    419        cd Cabal    && $(CABAL) build     --distpref=dist-bootstrapping
    520        cd Cabal    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
    621        -cd hpc    && $(CABAL) clean     --distpref=dist-bootstrapping
    722-       cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
    8 +       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
     23+       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
    924        cd hpc    && $(CABAL) build     --distpref=dist-bootstrapping
    1025        cd hpc    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
Note: See TracChangeset for help on using the changeset viewer.