diff options
| author | pgj <pgj@FreeBSD.org> | 2014-03-29 08:52:54 +0800 |
|---|---|---|
| committer | pgj <pgj@FreeBSD.org> | 2014-03-29 08:52:54 +0800 |
| commit | 43e85f045160cde4e9f221f2b7036ca7ed6bb478 (patch) | |
| tree | ddc21a13929c289330620e015fcff9a9b5d452e3 /lang/ghc | |
| parent | 8d18fcb8da6b6921891b78fe19abb842f423f2f3 (diff) | |
| download | freebsd-ports-gnome-43e85f045160cde4e9f221f2b7036ca7ed6bb478.tar.gz freebsd-ports-gnome-43e85f045160cde4e9f221f2b7036ca7ed6bb478.tar.zst freebsd-ports-gnome-43e85f045160cde4e9f221f2b7036ca7ed6bb478.zip | |
- Reroll and update bootstrap Haskell compilers to GHC 7.6.3 on 8.x and
9.x in order to prevent run-time breakage after the recent changes in
libiconv
- Bump port revision for lang/ghc and all dependents, as a consequence
Obtained from: FreeBSD Haskell
Diffstat (limited to 'lang/ghc')
| -rw-r--r-- | lang/ghc/Makefile | 10 | ||||
| -rw-r--r-- | lang/ghc/distinfo | 16 |
2 files changed, 11 insertions, 15 deletions
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index ddc4d8b695fa..8923a38f35a7 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -3,7 +3,7 @@ PORTNAME= ghc PORTVERSION= 7.6.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ ${MASTER_SITE_LOCAL:S/$/:boot/} @@ -74,11 +74,7 @@ LIB_DEPENDS+= ffi.6:${PORTSDIR}/devel/libffi .if empty(PORT_OPTIONS:MBOOT) -.if ${OSVERSION} >= 1000043 BOOT_GHC_VERSION= 7.6.3 -.else -BOOT_GHC_VERSION= 7.4.1 -.endif EXTRA_PATCHES= ${PATCHDIR}/nopatch-.._ghc-${BOOT_GHC_VERSION}-boot_rts_package.conf.in @@ -151,7 +147,7 @@ BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH} -CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} --with-gcc=${CC} +CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} --with-gcc=${CC} --with-ld=${LD} CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} .else # MBOOT @@ -316,7 +312,7 @@ pre-configure: ${TAR} xvf ${DISTDIR}/hscolour-${HSCOLOUR_VERSION}.tar.gz && \ cd hscolour-${HSCOLOUR_VERSION} && \ ${SLAVE_CMD} ghc --make -o Setup Setup.hs -package Cabal && \ - ${SLAVE_CMD} ./Setup configure --ghc --prefix=${SLAVES_PREFIX} && \ + ${SLAVE_CMD} ./Setup configure --ghc --prefix=${SLAVES_PREFIX} --with-gcc=${CC} --with-ld=${LD} && \ ${SLAVE_CMD} ./Setup build && \ ${SLAVE_CMD} ./Setup install) .endif diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index adba6a5dcb1a..7eff75e841c4 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -2,14 +2,14 @@ SHA256 (ghc-7.6.3-src.tar.bz2) = bd43823d31f6b5d0b2ca7b74151a8f98336ab0800be85f4 SIZE (ghc-7.6.3-src.tar.bz2) = 110763823 SHA256 (hscolour-1.20.3.tar.gz) = 3adb816fba3ecdf9f1ee5fb23feb0611b0762f7e8c2a282c2def5cc2f5483d96 SIZE (hscolour-1.20.3.tar.gz) = 25810 -SHA256 (ghc-7.4.1-i386-freebsd8-boot.tar.bz2) = b58f5b346c2b261f6357f5f72a0bf2c3c766e914cffbe6f2aefb1abf67b9a797 -SIZE (ghc-7.4.1-i386-freebsd8-boot.tar.bz2) = 45447162 -SHA256 (ghc-7.4.1-amd64-freebsd8-boot.tar.bz2) = 536da87dc9e32e98f9258e29b3a44846db6ac786f26b426da4808c33fcc92914 -SIZE (ghc-7.4.1-amd64-freebsd8-boot.tar.bz2) = 45322403 -SHA256 (ghc-7.4.1-i386-freebsd9-boot.tar.bz2) = 2af7912a14e6e31c81d2ef4505c0354ea28c3e263761f1f0282a836fe58bc8e7 -SIZE (ghc-7.4.1-i386-freebsd9-boot.tar.bz2) = 46254818 -SHA256 (ghc-7.4.1-amd64-freebsd9-boot.tar.bz2) = 8dc43c1ed2f026837947d938736ee6084f151fa5617998fca55420418f4ea28f -SIZE (ghc-7.4.1-amd64-freebsd9-boot.tar.bz2) = 46427727 +SHA256 (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = efdb68255cdcdeabbec1031a44f631cf8d0a619f9687b09d5a00230d3b871148 +SIZE (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = 55495926 +SHA256 (ghc-7.6.3-amd64-freebsd8-boot.tar.bz2) = 15ab9262d0f7ba213431b73e1a21318d5a420fb298b3f7cb28da1c8562241dcd +SIZE (ghc-7.6.3-amd64-freebsd8-boot.tar.bz2) = 55410502 +SHA256 (ghc-7.6.3-i386-freebsd9-boot.tar.bz2) = 2a10cc8aa24282612c1ba9a8dd2234192bef2f307fd70fa209b32bb97a1d73a2 +SIZE (ghc-7.6.3-i386-freebsd9-boot.tar.bz2) = 55500650 +SHA256 (ghc-7.6.3-amd64-freebsd9-boot.tar.bz2) = a0e21b166c94994a22005d0bb15822d16c10e79856f57b500466e23d8f5c13a6 +SIZE (ghc-7.6.3-amd64-freebsd9-boot.tar.bz2) = 55418614 SHA256 (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 4ab59ac9642641d612fdb636e544248ee2e74834bafe1d29ef556215ea097409 SIZE (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 55512004 SHA256 (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 8ce856cbd5b9fa230d17bc3d28b96206d84dce4aa3c1c9c7016262ff132271ad |