Date: Sun, 28 May 2023 16:40:01 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8657162e37c4 - main - lang/ghc: Pick correct Hadrian plan from the slave ports. Message-ID: <202305281640.34SGe186015515@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8657162e37c4ad313bedf0fc9e09e870884fe93b commit 8657162e37c4ad313bedf0fc9e09e870884fe93b Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-05-28 16:38:39 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2023-05-28 16:39:56 +0000 lang/ghc: Pick correct Hadrian plan from the slave ports. --- lang/ghc/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 08434e302cb6..9fdde90a0519 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -118,8 +118,10 @@ BOOT_SCRIPT= ./boot .if ${SLAVE_PORT} != "yes" PORTDOCS= * +HADRIAN_PLAN= ${PATCHDIR}/plan-bootstrap-${BOOT_GHC_VERSION:C/\./_/g}.json .else HADRIAN_DOCS_ARG= --docs=none +HADRIAN_PLAN= ${MASTERDIR}/files/plan-bootstrap-${BOOT_GHC_VERSION:C/\./_/g}.json PLIST_SUB+= GMP= .endif @@ -313,7 +315,7 @@ create-hadrian-bootstrap: # Predefined plans use integer-gmp, while we build bootstraps with integer-simple # Predefined plans aren't pretty-printed, so we can't easily patch them cd ${WRKSRC}/hadrian/bootstrap && \ - ./bootstrap.py -w ${BOOT_GHC} --deps ${PATCHDIR}/plan-bootstrap-${BOOT_GHC_VERSION:C/\./_/g}.json fetch -o /tmp/hadrian-${GHC_VERSION}-boot + ./bootstrap.py -w ${BOOT_GHC} --deps ${HADRIAN_PLAN} fetch -o /tmp/hadrian-${GHC_VERSION}-boot @cd /tmp \ && sha256 hadrian-${GHC_VERSION}-boot.tar.gz \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305281640.34SGe186015515>