Date: Wed, 3 Mar 2021 17:48:44 +0000 (UTC) From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567105 - head/lang/ghc Message-ID: <202103031748.123HmiYA025405@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mikael Date: Wed Mar 3 17:48:44 2021 New Revision: 567105 URL: https://svnweb.freebsd.org/changeset/ports/567105 Log: lang/ghc: Update arm bootstrap The ghc bootstrap (v8.6.5) on arm requires devel/llvm60, this llvm version is obsolete and still uses python2.7 to build, update the bootstrap to a newer version (v8.10.4) that requires devel/llvm90 Bump bootstrap to 8.10.4 on arm Bump minimum required FreeBSD version, 12.1 is not supported anymore Drop unecessary RUN_DEPENDS Collapse arm ARCH conditionnal Approved by: arrowd Differential Revision: https://reviews.freebsd.org/D28906 Modified: head/lang/ghc/Makefile head/lang/ghc/distinfo Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Wed Mar 3 17:06:13 2021 (r567104) +++ head/lang/ghc/Makefile Wed Mar 3 17:48:44 2021 (r567105) @@ -79,7 +79,7 @@ CABAL_VERSION= 3.2.1.0 HSCOLOUR_VERSION= 1.24.4 LLVM_VERSION= 90 # LLVM version that bootstrap compiler uses -BOOT_LLVM_VERSION= 60 +BOOT_LLVM_VERSION= 90 PLIST_SUB= GHC_VERSION=${GHC_VERSION} CABAL_VERSION=${CABAL_VERSION} @@ -101,6 +101,8 @@ CONFIGURE_ARGS+= --enable-dtrace=0 .if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 BOOT_GHC_VERSION= 8.6.3 +.elif ${ARCH} == aarch64 || ${ARCH:Marmv*} +BOOT_GHC_VERSION= 8.10.4 .else BOOT_GHC_VERSION= 8.6.5 .endif @@ -140,7 +142,8 @@ ELEVEN_SUFX= 11 DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${BOOTSTRAPS_SUFFIX}${ELEVEN_SUFX}${EXTRACT_SUFX}:boot .endif # MBOOT -.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 +.if ${ARCH} == aarch64 || ${ARCH:Marmv*} +# ghc-8.10.x on arm requires devel/llvm90 # 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 @@ -155,16 +158,15 @@ CONFIGURE_ENV+= LLC=llc${LLVM_VERSION} \ # 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} -RUN_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} # Keep in sync with BOOT_LLVM_VERSION -BINARY_ALIAS+= llc-6.0=llc60 \ - opt-6.0=opt60 +BINARY_ALIAS+= llc-9.0=llc90 \ + opt-9.0=opt90 . endif .endif -.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64 -. if ${OSVERSION} < 1201000 -IGNORE= lang/ghc requires at least FreeBSD 12.1-RELEASE +.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH} == powerpc64 +. if ${OSVERSION} < 1202000 +IGNORE= lang/ghc requires at least FreeBSD 12.2-RELEASE . endif . ifdef QEMU_EMULATING IGNORE= qemu-user-static isn't able to build lang/ghc, but it builds fine on a real hardware Modified: head/lang/ghc/distinfo ============================================================================== --- head/lang/ghc/distinfo Wed Mar 3 17:06:13 2021 (r567104) +++ head/lang/ghc/distinfo Wed Mar 3 17:48:44 2021 (r567105) @@ -9,12 +9,12 @@ SHA256 (ghc-8.6.5-boot-amd64-freebsd11.tar.xz) = 07d4c 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.6.5-boot-aarch64-freebsd.tar.xz) = 63d461161c87132a3c3d3683c4995f4209e139fe719a25e551a600412c11aa3e -SIZE (ghc-8.6.5-boot-aarch64-freebsd.tar.xz) = 136306580 -SHA256 (ghc-8.6.5-boot-armv6-freebsd.tar.xz) = 1fe5f4f5d1bfec5d45b0f92101b5be818b221c730655a4f1b31ecbb8382b7108 -SIZE (ghc-8.6.5-boot-armv6-freebsd.tar.xz) = 136889664 -SHA256 (ghc-8.6.5-boot-armv7-freebsd.tar.xz) = ce4bc7fd20bb420963081171e483beb7387f9704323f7c03e36bbf3bf68a00ea -SIZE (ghc-8.6.5-boot-armv7-freebsd.tar.xz) = 135237856 +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 +SIZE (ghc-8.10.4-boot-armv7-freebsd.tar.xz) = 149265452 SHA256 (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 89dfbfab84aef489ca9d0ff6fdf97152cff2412f6a8b9b1e57025b2019908318 SIZE (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 113782560 SHA256 (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103031748.123HmiYA025405>