Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Mar 2019 04:53:53 +0000 (UTC)
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r497066 - in head/lang: ghc ghc843 ghc844 ghc862
Message-ID:  <201903290453.x2T4rrtc043166@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arrowd
Date: Fri Mar 29 04:53:53 2019
New Revision: 497066
URL: https://svnweb.freebsd.org/changeset/ports/497066

Log:
  Drop ARM support for GHC 8.4 and update bootstrap compilers to 8.6.3.
  
  ARM support required LLVM 5, which is getting pushed out of ports.
  
  Submitted by:	Mikael Urankar <mikael.urankar@gmail.com>
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D19722

Modified:
  head/lang/ghc/bsd.ghc.mk
  head/lang/ghc/distinfo
  head/lang/ghc843/distinfo
  head/lang/ghc844/distinfo
  head/lang/ghc862/distinfo

Modified: head/lang/ghc/bsd.ghc.mk
==============================================================================
--- head/lang/ghc/bsd.ghc.mk	Fri Mar 29 01:21:22 2019	(r497065)
+++ head/lang/ghc/bsd.ghc.mk	Fri Mar 29 04:53:53 2019	(r497066)
@@ -5,13 +5,13 @@
 # Maintained by: haskell@FreeBSD.org
 #
 
-ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
+ONLY_FOR_ARCHS=	amd64 i386
 
 GHC_VERSION_MAJOR=	${GHC_VERSION:S/./ /g:[1]}
 GHC_VERSION_MINOR=	${GHC_VERSION:S/./ /g:[2]}
 
 .if ${GHC_VERSION_MAJOR} >= 8 && ${GHC_VERSION_MINOR} >= 6
-ONLY_FOR_ARCHS+=	powerpc64
+ONLY_FOR_ARCHS+=	aarch64 armv6 armv7 powerpc64
 .endif
 
 DATADIR=	${PREFIX}/share/ghc-${GHC_VERSION}
@@ -88,19 +88,17 @@ GHC_ARCH=		${ARCH:S/amd64/x86_64/:C/armv.*/arm/}
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MBOOT)
-.  if ${ARCH} == armv6 || ${ARCH} == armv7
-BOOT_GHC_VERSION=	8.4.2
-.  elif ${ARCH} == powerpc64
-BOOT_GHC_VERSION=	8.6.3
-.  else
+.  if ${ARCH} == amd64 || ${ARCH} == i386
 BOOT_GHC_VERSION=	8.4.3
+.  else
+BOOT_GHC_VERSION=	8.6.3
 .  endif
 
 # When GHC being compiled and GHC used for bootstrapping support different
 # LLVM versions, we have to pull in both. Luckily, this is relatively rare.
 .  if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
 # LLVM version that bootstrap compiler uses
-BOOT_LLVM_VERSION=	50
+BOOT_LLVM_VERSION=	60
 
 .    if ${BOOT_LLVM_VERSION} != ${LLVM_VERSION}
 BUILD_DEPENDS+=		llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION}

Modified: head/lang/ghc/distinfo
==============================================================================
--- head/lang/ghc/distinfo	Fri Mar 29 01:21:22 2019	(r497065)
+++ head/lang/ghc/distinfo	Fri Mar 29 04:53:53 2019	(r497066)
@@ -7,11 +7,11 @@ SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b
 SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592
 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
 SIZE (hscolour-1.24.4.tar.gz) = 28729
-SHA256 (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 84611f37d31a43a3216274ee7dcee4b89f2c5ef6ab713222f266b5658c736e05
-SIZE (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 99933576
-SHA256 (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 61d3a4486dbb904b05a735e98f23a49c2b464d6b19212dd655ff578f36d02f0d
-SIZE (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 107368936
-SHA256 (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = eedb9416870bfe82315155751871e31e815b718b381ccf4f7e45a99a6ad7c94d
-SIZE (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = 110153548
+SHA256 (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 5a1f043ada7262cf4eac4a900b7d5af965e5f6f89939e635ad0c10b0185a15b7
+SIZE (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 104631584
+SHA256 (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 5260987646c9f6102f35a7cdedfde785227c4f317fb3ccc52d06cae6a0950a68
+SIZE (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 113748008
+SHA256 (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 765d01199ceb0dfa5c84de692cec427e67ae1cf1ba6e1fc20e7ca854c6ceb556
+SIZE (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 114046668
 SHA256 (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4
 SIZE (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = 112652192

Modified: head/lang/ghc843/distinfo
==============================================================================
--- head/lang/ghc843/distinfo	Fri Mar 29 01:21:22 2019	(r497065)
+++ head/lang/ghc843/distinfo	Fri Mar 29 04:53:53 2019	(r497066)
@@ -7,9 +7,3 @@ SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b
 SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592
 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
 SIZE (hscolour-1.24.4.tar.gz) = 28729
-SHA256 (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 84611f37d31a43a3216274ee7dcee4b89f2c5ef6ab713222f266b5658c736e05
-SIZE (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 99933576
-SHA256 (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 61d3a4486dbb904b05a735e98f23a49c2b464d6b19212dd655ff578f36d02f0d
-SIZE (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 107368936
-SHA256 (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = eedb9416870bfe82315155751871e31e815b718b381ccf4f7e45a99a6ad7c94d
-SIZE (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = 110153548

Modified: head/lang/ghc844/distinfo
==============================================================================
--- head/lang/ghc844/distinfo	Fri Mar 29 01:21:22 2019	(r497065)
+++ head/lang/ghc844/distinfo	Fri Mar 29 04:53:53 2019	(r497066)
@@ -7,9 +7,3 @@ SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b
 SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592
 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
 SIZE (hscolour-1.24.4.tar.gz) = 28729
-SHA256 (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 84611f37d31a43a3216274ee7dcee4b89f2c5ef6ab713222f266b5658c736e05
-SIZE (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 99933576
-SHA256 (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 61d3a4486dbb904b05a735e98f23a49c2b464d6b19212dd655ff578f36d02f0d
-SIZE (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 107368936
-SHA256 (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = eedb9416870bfe82315155751871e31e815b718b381ccf4f7e45a99a6ad7c94d
-SIZE (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = 110153548

Modified: head/lang/ghc862/distinfo
==============================================================================
--- head/lang/ghc862/distinfo	Fri Mar 29 01:21:22 2019	(r497065)
+++ head/lang/ghc862/distinfo	Fri Mar 29 04:53:53 2019	(r497066)
@@ -7,11 +7,11 @@ SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b
 SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592
 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
 SIZE (hscolour-1.24.4.tar.gz) = 28729
-SHA256 (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 84611f37d31a43a3216274ee7dcee4b89f2c5ef6ab713222f266b5658c736e05
-SIZE (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 99933576
-SHA256 (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 61d3a4486dbb904b05a735e98f23a49c2b464d6b19212dd655ff578f36d02f0d
-SIZE (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 107368936
-SHA256 (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = eedb9416870bfe82315155751871e31e815b718b381ccf4f7e45a99a6ad7c94d
-SIZE (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = 110153548
+SHA256 (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 5a1f043ada7262cf4eac4a900b7d5af965e5f6f89939e635ad0c10b0185a15b7
+SIZE (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 104631584
+SHA256 (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 5260987646c9f6102f35a7cdedfde785227c4f317fb3ccc52d06cae6a0950a68
+SIZE (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 113748008
+SHA256 (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 765d01199ceb0dfa5c84de692cec427e67ae1cf1ba6e1fc20e7ca854c6ceb556
+SIZE (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 114046668
 SHA256 (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4
 SIZE (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = 112652192



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903290453.x2T4rrtc043166>