From owner-dev-commits-ports-all@freebsd.org Thu Jun 24 16:00:48 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4C26B65053B; Thu, 24 Jun 2021 16:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G9lGm14scz4kbt; Thu, 24 Jun 2021 16:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0E80C1AABB; Thu, 24 Jun 2021 16:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15OG0lv6047837; Thu, 24 Jun 2021 16:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15OG0l0j047836; Thu, 24 Jun 2021 16:00:47 GMT (envelope-from git) Date: Thu, 24 Jun 2021 16:00:47 GMT Message-Id: <202106241600.15OG0l0j047836@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: e099e7c8c360 - main - lang/ghc: Fix build on aarch64 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e099e7c8c360778d6cd73b916fb87e905fbfbd19 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2021 16:00:48 -0000 The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=e099e7c8c360778d6cd73b916fb87e905fbfbd19 commit e099e7c8c360778d6cd73b916fb87e905fbfbd19 Author: Mikael Urankar AuthorDate: 2021-06-20 16:01:39 +0000 Commit: Mikael Urankar CommitDate: 2021-06-24 16:00:25 +0000 lang/ghc: Fix build on aarch64 BINARY_ALIAS doesn't work anymore. Pass the correct environment variables in the pre-configure target instead. PR: 256605 Reported by: tech-lists@zyxst.net Approved by: arrowd (previous version) --- lang/ghc/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 6163fbc703cb..e25592e5b332 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -74,7 +74,7 @@ PROFILE_SUB_LIST_OFF= WITH_PROFILE="NO" GHC_VERSION= 8.10.5 CABAL_VERSION= 3.2.1.0 HSCOLOUR_VERSION= 1.24.4 -LLVM_VERSION= 90 +LLVM_VERSION= 10 # LLVM version that bootstrap compiler uses BOOT_LLVM_VERSION= 90 @@ -137,7 +137,7 @@ DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${BOOTSTRAPS_SUFFIX}${E .endif # MBOOT .if ${ARCH} == aarch64 || ${ARCH:Marmv*} -# ghc-8.10.x on arm requires devel/llvm90 +# 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 @@ -152,9 +152,10 @@ 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} -# Keep in sync with BOOT_LLVM_VERSION -BINARY_ALIAS+= llc-9.0=llc90 \ - opt-9.0=opt90 +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 @@ -208,7 +209,7 @@ pre-configure: # If we are using bootstrap compiler, configure and install it into ${BOOT_DIR} .if empty(PORT_OPTIONS:MBOOT) - cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} --prefix=${BOOT_DIR} + cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_ENV_BOOTSTRAP} ${CONFIGURE_CMD} --prefix=${BOOT_DIR} cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install .else # otherwise, make sure we have "ghc" in PATH