Date: Thu, 12 Sep 2013 22:02:32 +0000 (UTC) From: Gabor Pali <pgj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327114 - in head/lang/ghc: . files Message-ID: <201309122202.r8CM2W7r047439@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pgj Date: Thu Sep 12 22:02:32 2013 New Revision: 327114 URL: http://svnweb.freebsd.org/changeset/ports/327114 Log: - Fix build on recent head where iconv(1) is in base by rolling new 7.6.3-based bootstrap compilers without any external dependencies [1] - Update bootstrap hscolour to 1.20.3, so both 7.4 and 7.6 bootstraps can work with it - Remove the line for the 7.x bootstrap as no such one exists any more Thanks to: cognet [1] Obtained from: FreeBSD Haskell Added: head/lang/ghc/files/nopatch-.._ghc-7.6.3-boot_rts_package.conf.in (contents, props changed) Modified: head/lang/ghc/Makefile head/lang/ghc/distinfo Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Thu Sep 12 21:53:45 2013 (r327113) +++ head/lang/ghc/Makefile Thu Sep 12 22:02:32 2013 (r327114) @@ -15,8 +15,7 @@ COMMENT= Compiler for the functional lan ONLY_FOR_ARCHS= i386 amd64 GHC_VERSION= ${PORTVERSION} -BOOT_GHC_VERSION= 7.4.1 -HSCOLOUR_VERSION= 1.20.2 +HSCOLOUR_VERSION= 1.20.3 DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION} EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION} @@ -72,28 +71,34 @@ LIB_DEPENDS+= ffi.6:${PORTSDIR}/devel/li .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 .if ${ARCH} == "i386" -.if ${OSVERSION} >= 900000 +.if ${OSVERSION} >= 1000043 +DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd10-boot${EXTRACT_SUFX}:boot +.elif ${OSVERSION} >= 900000 DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd9-boot${EXTRACT_SUFX}:boot .elif ${OSVERSION} >= 800000 DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd8-boot${EXTRACT_SUFX}:boot -.elif ${OSVERSION} >= 700000 -DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd7-boot${EXTRACT_SUFX}:boot .else IGNORE= unsupported .endif .elif ${ARCH} == "amd64" -.if ${OSVERSION} >= 900000 +.if ${OSVERSION} >= 1000043 +DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd10-boot${EXTRACT_SUFX}:boot +.elif ${OSVERSION} >= 900000 DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd9-boot${EXTRACT_SUFX}:boot .elif ${OSVERSION} >= 800000 DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd8-boot${EXTRACT_SUFX}:boot -.elif ${OSVERSION} >= 700000 -DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd7-boot${EXTRACT_SUFX}:boot .else IGNORE= unsupported .endif @@ -114,9 +119,12 @@ HACKAGE_ARCH?= packages/archive/ CONFIGURE_ARGS= --with-gcc=${CC} \ --with-ld=${LD} \ --with-gmp-includes=${LOCALBASE}/include \ - --with-gmp-libraries=${LOCALBASE}/lib \ - --with-iconv-includes=${LOCALBASE}/include \ + --with-gmp-libraries=${LOCALBASE}/lib + +.if ${OSVERSION} < 1000043 +CONFIGURE_ARGS+= --with-iconv-includes=${LOCALBASE}/include \ --with-iconv-libraries=${LOCALBASE}/lib +.endif .if ${PORT_OPTIONS:MDYNAMIC} CONFIGURE_ARGS+= --with-system-libffi \ Modified: head/lang/ghc/distinfo ============================================================================== --- head/lang/ghc/distinfo Thu Sep 12 21:53:45 2013 (r327113) +++ head/lang/ghc/distinfo Thu Sep 12 22:02:32 2013 (r327114) @@ -1,7 +1,7 @@ SHA256 (ghc-7.6.3-src.tar.bz2) = bd43823d31f6b5d0b2ca7b74151a8f98336ab0800be85f45bb591c9c26aac998 SIZE (ghc-7.6.3-src.tar.bz2) = 110763823 -SHA256 (hscolour-1.20.2.tar.gz) = a52910f4c4c5576bed80e23aa914c71c3975d4cd9cd79a9c85e2617d97a8824a -SIZE (hscolour-1.20.2.tar.gz) = 25722 +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 @@ -10,3 +10,7 @@ SHA256 (ghc-7.4.1-i386-freebsd9-boot.tar 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-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 +SIZE (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 55418435 Added: head/lang/ghc/files/nopatch-.._ghc-7.6.3-boot_rts_package.conf.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ghc/files/nopatch-.._ghc-7.6.3-boot_rts_package.conf.in Thu Sep 12 22:02:32 2013 (r327114) @@ -0,0 +1,11 @@ +--- ../ghc-7.6.3-boot/rts/package.conf.in.orig 2013-04-18 22:22:47.000000000 +0100 ++++ ../ghc-7.6.3-boot/rts/package.conf.in 2013-09-06 23:01:22.000000000 +0100 +@@ -141,6 +141,8 @@ + , "-u", "base_GHCziConcziSignal_runHandlers_closure" + #endif + ++ , "-L%%LOCALBASE%%/lib" ++ + /* Pick up static libraries in preference over dynamic if in earlier search + * path. This is important to use the static gmp in preference on Mac OS. + * The used option is specific to the Darwin linker.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309122202.r8CM2W7r047439>