Index: lang/ghc/bsd.ghc.mk =================================================================== --- lang/ghc/bsd.ghc.mk +++ lang/ghc/bsd.ghc.mk @@ -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 @@ .include .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} Index: lang/ghc/distinfo =================================================================== --- lang/ghc/distinfo +++ lang/ghc/distinfo @@ -7,11 +7,11 @@ 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 Index: lang/ghc843/distinfo =================================================================== --- lang/ghc843/distinfo +++ lang/ghc843/distinfo @@ -7,9 +7,3 @@ 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 Index: lang/ghc844/distinfo =================================================================== --- lang/ghc844/distinfo +++ lang/ghc844/distinfo @@ -7,9 +7,3 @@ 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 Index: lang/ghc862/distinfo =================================================================== --- lang/ghc862/distinfo +++ lang/ghc862/distinfo @@ -7,11 +7,11 @@ 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