From nobody Sun May 28 16:40:01 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QTksY2qtgz4XbkY; Sun, 28 May 2023 16:40:01 +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 4QTksY27Ptz3NTv; Sun, 28 May 2023 16:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685292001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n1jsb7/7J/asC+s4Zo5j4HgUoFeRINZmQT3mxCC9BwM=; b=SSgL8Ki+h3tkOYzgVkgmU2+rbNl92LLw7XKLOFVbdXZF9SyDt1oBW9gMH4YelJdrmnuqHa sBvqhUkvYs8duVl5vLpbTcIH/CIKN3A7qpg6LRbAg5sbWM6DtC8Tz27Urir0qbMic1rSd4 LdGrN06pqiYkkAQ9iO+HSZ4twPBRJLySIXttlxOzb6KIb/6ngXgN6f3sYUJuwGKvPv/Gb2 ycCrVIyZDpdIhFJ2cD6MJWW/T8fkh/ZADnQ3+sGhDQFPeRWw3dpjMP8rckZCsYRrfW/n95 b6VQIhSvjFo+IjeTr4KVbeAcVT1sTAo1XtWeCknKBzQmYNfe960s+RD5bmDSpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685292001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n1jsb7/7J/asC+s4Zo5j4HgUoFeRINZmQT3mxCC9BwM=; b=bO2uqPorR+9lMbBbcHdGoywyRXCpjhlMi319xns1EgpEfnsMfPt7SEBMs3xqWX+HpG4Xb1 jen2Ki2tDl5JequzDLnAdoWvCGSInirB7BL+GPHA2XkyiF7qrxEmES4uABWTcxOMx4GGVI wbH49VjxopDN964cdWJSWg7EgUo0gdi5CCSacfqjVGmvFAEkXxyaDZ2m/M4lPd/U/U3wG1 NBCvn/5j5WwVC118XIQTs81YoDQHbjOsYinJko4gZ5p28giB/fNUgy8Hg7yTT6z66eqcjm QOIT8Wf79byWDwCrAsZbmimZetM+57tWLWE05lUFyskQXHk0Ig+7LnZW26PmVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685292001; a=rsa-sha256; cv=none; b=vfrK8WZWycoAi5/r0DMK2e3YwiD4LHj3P92svPDshXFc9rJXy1bEgRoaFyw2N24lDAyBp3 oyqMjm+YGJ7UvRTiFrY2UFP+tH1md13smXBd04IQwNB2JhUqo5fDdo+2fy4b16n9JqndSW m3U9hkKlGFU0YV4QbWNfrepuRhrgkWfvEpyZ5vvvHmyc6o9DrVOlhb/ccmeG0obv33i6F3 MZsLSh1whOUIy0bSeJkGp1gHu58L+9ReJTCWPtZ2z+KBMW/jukahRZIUCCADyDYOCPYTz+ VOkSkAmUMNyVXcUdxPTKTct6NaiTt1TeAZtE7U+PjCJB5q9/DuOJN8wigYaH6w== 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 4QTksY14YZzcd3; Sun, 28 May 2023 16:40:01 +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 34SGe1mu015538; Sun, 28 May 2023 16:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SGe186015515; Sun, 28 May 2023 16:40:01 GMT (envelope-from git) Date: Sun, 28 May 2023 16:40:01 GMT Message-Id: <202305281640.34SGe186015515@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 8657162e37c4 - main - lang/ghc: Pick correct Hadrian plan from the slave ports. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8657162e37c4ad313bedf0fc9e09e870884fe93b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8657162e37c4ad313bedf0fc9e09e870884fe93b commit 8657162e37c4ad313bedf0fc9e09e870884fe93b Author: Gleb Popov AuthorDate: 2023-05-28 16:38:39 +0000 Commit: Gleb Popov 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 \