diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -76,7 +76,7 @@ HSCOLOUR_VERSION= 1.24.4 LLVM_VERSION= 10 # LLVM version that bootstrap compiler uses -BOOT_LLVM_VERSION= 90 +BOOT_LLVM_VERSION= 10 PLIST_SUB= GHC_VERSION=${GHC_VERSION} CABAL_VERSION=${CABAL_VERSION} @@ -98,7 +98,7 @@ .if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 BOOT_GHC_VERSION= 8.6.3 .elif ${ARCH} == aarch64 || ${ARCH:Marmv*} -BOOT_GHC_VERSION= 8.10.4 +BOOT_GHC_VERSION= 8.10.7 .else BOOT_GHC_VERSION= 8.6.5 .endif @@ -139,22 +139,14 @@ # ghc-8.10.x on arm requires devel/llvm10 # CONFIGURE_TARGET must to be the same as the llvm triple CONFIGURE_TARGET= ${ARCH}-unknown-freebsd${"${ARCH:Maarch64}" != "":?:-gnueabihf} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-aclocal.m4 +CONFIGURE_ARGS+= --host=${CONFIGURE_TARGET} BUILD_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} RUN_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} -CONFIGURE_ENV+= LLC=llc${LLVM_VERSION} \ - OPT=opt${LLVM_VERSION} \ - CLANG=clang${LLVM_VERSION} \ - CC=clang${LLVM_VERSION} # 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 ${BOOT_LLVM_VERSION} != ${LLVM_VERSION} BUILD_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} -CONFIGURE_ENV_BOOTSTRAP=LLC=llc${BOOT_LLVM_VERSION} \ - OPT=opt${BOOT_LLVM_VERSION} \ - CLANG=clang${BOOT_LLVM_VERSION} \ - CC=clang${BOOT_LLVM_VERSION} . endif .endif diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -9,8 +9,6 @@ SIZE (ghc-8.6.5-boot-amd64-freebsd11.tar.xz) = 68965716 SHA256 (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = cd208fbb6b2a158ff8c5d6227e0babd8c224867ea301abf970dc446f04c9e95f SIZE (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = 67439136 -SHA256 (ghc-8.10.4-boot-aarch64-freebsd.tar.xz) = f5739647d97c0f2b217bd8cb01a40a38b5659e1743cf97d1f55c8c8536d4e6e9 -SIZE (ghc-8.10.4-boot-aarch64-freebsd.tar.xz) = 121587472 SHA256 (ghc-8.10.4-boot-armv6-freebsd.tar.xz) = 04b207b787bdff71028b8d4c311a47105d7b098809e8fd21b788b1ab0dccdf22 SIZE (ghc-8.10.4-boot-armv6-freebsd.tar.xz) = 148679080 SHA256 (ghc-8.10.4-boot-armv7-freebsd.tar.xz) = db94e69b83a93fba9c136e890ccb0bf76b6d163ac3979dadb1568e81c3267744 @@ -19,5 +17,11 @@ SIZE (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 113782560 SHA256 (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4 SIZE (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = 112652192 +SHA256 (ghc-8.10.7-boot-aarch64-freebsd.tar.xz) = 9bbae471c65a04a9787208d421ac1f3cf251f4e18dc974238172721148da6f49 +SIZE (ghc-8.10.7-boot-aarch64-freebsd.tar.xz) = 125236788 +SHA256 (ghc-8.10.7-boot-armv7-freebsd.tar.xz) = 15708f4f4324d7e87ddbd6548a6ca72dc8587de5a24c2498453603fa73b5ccfb +SIZE (ghc-8.10.7-boot-armv7-freebsd.tar.xz) = 127945844 +SHA256 (ghc-8.10.7-boot-armv6-freebsd.tar.xz) = 84010e11f92e0a9fe106b80cbaf027ba342da055c3ad6d89eab0a389c0523e1b +SIZE (ghc-8.10.7-boot-armv6-freebsd.tar.xz) = 129190568 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d SIZE (hscolour-1.24.4.tar.gz) = 28729 diff --git a/lang/ghc/files/extra-patch-aclocal.m4 b/lang/ghc/files/extra-patch-aclocal.m4 deleted file mode 100644 --- a/lang/ghc/files/extra-patch-aclocal.m4 +++ /dev/null @@ -1,15 +0,0 @@ ---- aclocal.m4.orig 2020-08-07 16:52:59 UTC -+++ aclocal.m4 -@@ -2461,12 +2461,6 @@ AC_DEFUN([FIND_LD],[ - [enable_ld_override=yes]) - - find_ld() { -- # Make sure the user didn't specify LD manually. -- if test "z$LD" != "z"; then -- AC_CHECK_TARGET_TOOL([LD], [ld]) -- return -- fi -- - # Manually iterate over possible names since we want to ensure that, e.g., - # if ld.lld is installed but gcc doesn't support -fuse-ld=lld, that we - # then still try ld.gold and -fuse-ld=gold. diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4 new file mode 100644 --- /dev/null +++ b/lang/ghc/files/patch-aclocal.m4 @@ -0,0 +1,20 @@ +--- aclocal.m4.orig 2020-08-07 16:52:59 UTC ++++ aclocal.m4 +@@ -2221,7 +2221,7 @@ AC_DEFUN([XCODE_VERSION],[ + # FIND_LLVM_PROG() + # -------------------------------- + # Find where the llvm tools are. We have a special function to handle when they +-# are installed with a version suffix (e.g., llc-7, llc-7.0) and without (e.g. ++# are installed with a version suffix (e.g., llc-7, llc-7.0, llc70) and without (e.g. + # llc). + # + # $1 = the variable to set +@@ -2231,7 +2231,7 @@ AC_DEFUN([XCODE_VERSION],[ + # + AC_DEFUN([FIND_LLVM_PROG],[ + # Test for program with and without version name. +- PROG_VERSION_CANDIDATES=$(for llvmVersion in `seq $4 -1 $3`; do echo "$2-$llvmVersion $2-$llvmVersion.0"; done) ++ PROG_VERSION_CANDIDATES=$(for llvmVersion in `seq $4 -1 $3`; do echo "$2-$llvmVersion $2-$llvmVersion.0 $2$llvmVersion $2$llvmVersion0"; done) + AC_CHECK_TOOLS([$1], [$PROG_VERSION_CANDIDATES $2], []) + AS_IF([test x"$$1" != x],[ + PROG_VERSION=`$$1 --version | awk '/.*version [[0-9\.]]+/{for(i=1;i<=NF;i++){ if(\$i ~ /^[[0-9\.]]+$/){print \$i}}}'`