Changeset 53620


Ignore:
Timestamp:
Jul 10, 2009, 5:45:25 AM (10 years ago)
Author:
gwright@…
Message:

Add a patch to fix process hangs on some versions of OS X (shouldn't be needed
in the upcoming 6.10.4). Also, clean up some unneeded changes related to the
attempts to fix the build on Tiger. This reverts the removal of the ghc.cabal.in
patch; that may be the main cause of the recent build failures.

Location:
trunk/dports/lang/ghc
Files:
1 added
1 edited

Legend:

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

    r52332 r53620  
    66set canonicalname       ghc
    77version         6.10.3
    8 revision        1
     8revision        3
    99categories      lang haskell
    1010maintainers     gwright
     
    5454patchfiles      patch-configure.ac.diff                 \
    5555                patch-aclocal.m4.diff                   \
    56                 patch-libraries-Makefile.diff
     56                patch-compiler-ghc.cabal.in.diff        \
     57                patch-libraries-Makefile.diff           \
     58                patch-runProcess.c.diff
    5759
    5860depends_lib     port:libedit \
     
    197199                reinplace "s|XXPATH_TO_HSC2HSXX|${workpath}/ghc-bootstrap/bin/hsc2hs|" ${worksrcpath}/libraries/Makefile
    198200
    199 #               reinplace "s|XXPATH_TO_GMP_LIBRARYXX|${prefix}/lib|" ${worksrcpath}/compiler/ghc.cabal.in
    200 
    201                 reinplace "s|/opt/local/lib/ghc-${ghc_bootversion}|${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}|g" ${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/package.conf
     201                reinplace "s|XXMACPORTS_PREFIXXX|${prefix}|" ${worksrcpath}/compiler/ghc.cabal.in
     202
     203                reinplace "s|/opt/local/lib/ghc-${ghc_bootversion}|${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}|g" ${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/package.conf
    202204
    203205                reinplace "s|GHCBIN=/opt/local|GHCBIN=${workpath}/${canonicalname}-bootstrap|" ${workpath}/${canonicalname}-bootstrap/bin/ghc
     
    211213                                ${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/ghc-asm \
    212214                                ${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/ghc-split \
    213                                 ${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/package.conf
    214215                }
    215216}
     
    329330}
    330331
    331 # Fix a bug in the definition of 6.10.2's rts package:
    332 #
    333 post-activate {
    334         system "${prefix}/bin/ghc-pkg describe rts | sed 's/PAPI_INCLUDE_DIR//' | ${prefix}/bin/ghc-pkg update -"
    335 }
    336 
Note: See TracChangeset for help on using the changeset viewer.