From nobody Sat Jul 01 14:10:36 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 4QtYxS6JHSz4l3Tk; Sat, 1 Jul 2023 14:10:36 +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 4QtYxS5qflz3jYN; Sat, 1 Jul 2023 14:10:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688220636; 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=kG6Rt5CIQxZlmCXgBXHErLGTAfOAACuc8Wj7SIBBDtU=; b=ya8TlH4x3pE7Yt8c7hLT3XTucbfPsuLltIAx87jOyp/FcQr3JtHRBfzSE32BLWlcq74ME0 lWZ/CdNqqH850jYYc1D1iCeBSP7FjCNDXEjdYQnqRdfR8A61QDWcGZQvCGQAIzMBR+Qdzc b6zka85Ws3Zi8yRM7zQdcMbHCVRPPq/bKiG3Ls0yKzyd+xpV5i+SFJMBFYSI1+xM9CoKwR 3rBnGTsTbIghinAsI38hcYGb8EqxRu55NHH6v2REpLYt88Cs9gBeamaB+y8ebE/c72w/3Z jgLFusY9wyBcLjBQC9eRCmkvwcg4NlwLFZb6LOBZ2ZaxF4UcFOMlAbDXtTfR+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688220636; 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=kG6Rt5CIQxZlmCXgBXHErLGTAfOAACuc8Wj7SIBBDtU=; b=pB/MqZX+rYTXc90sO6MTOsdrsMpDp/BS4XodHK3qAsBHe57Zz4ykV2wZhKGuymmbWRuwj2 Yl9VKfQF2yODdroBoR6e2eWoXnx/AU92XDmnGqgFNI9HQ/UpJWPgqXh9oKfoNMwpF8hrlj jt56SxKdcEnGqYPU40gunXAm5edIo3IUfIiiAh1PitS4uoDne45gJquOw2+pkb0pzPHT7j 9KPwn3TTR63m5mDD8lxCamdFmsYL3XX9VleCoh573vhHKndxu8najUpHQ3dkK3gXNNugNM 1x2Jsax2/pvQr7rYu519W98VSMmH+76dQyuNKhMchWpoZTIqN+emGNZyjgEmiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688220636; a=rsa-sha256; cv=none; b=OAbPBfROQC7eEzS9If4S39jl2g4R2zq097Ml/QdL6gcyzQKbXsRov3qXnL/ho5124kG6e9 y4v5+e40/7Q/NyDyS/49eLn8/5vOfaFrYRZsxyM3XX3RYgMKoAh1+ID3AJWEcSlLWtNcLn Swc8sIP8CGo3LtoaQpner0RQt1pb02xE2dKIl2WquxDcbVfzVWy4poCqadDY5NUg4NrFpl oAD2zkJem6HnYPxPF1tput4rIS+lVPweAGn2nQvYfz/PZlHZrHt2iLMq5STjqx9FMwUztF iGuQUq4U1/ZXdMQt77bKLS2T1XFL7TR6CqhkuxzL+TLffPSzuBT4xDt6oDiREQ== 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 4QtYxS4XxlzTMs; Sat, 1 Jul 2023 14:10:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 361EAaKe049158; Sat, 1 Jul 2023 14:10:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361EAaiu049157; Sat, 1 Jul 2023 14:10:36 GMT (envelope-from git) Date: Sat, 1 Jul 2023 14:10:36 GMT Message-Id: <202307011410.361EAaiu049157@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: fd5e0843391c - main - lang/ghc: Reroll Aarch64 8.10.7 bootstrap and simplify Makefile. 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: fd5e0843391c41b3f9062b2c1ebf58f4f0fc20be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd5e0843391c41b3f9062b2c1ebf58f4f0fc20be commit fd5e0843391c41b3f9062b2c1ebf58f4f0fc20be Author: Gleb Popov AuthorDate: 2023-07-01 14:09:11 +0000 Commit: Gleb Popov CommitDate: 2023-07-01 14:10:30 +0000 lang/ghc: Reroll Aarch64 8.10.7 bootstrap and simplify Makefile. Also remove support for armv{6,7} due to problems in getting bootstraps. Obtained from: kevans --- lang/ghc/Makefile | 11 +---------- lang/ghc/distinfo | 10 +++------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index d230579297d5..7a42d5888840 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -13,7 +13,7 @@ WWW= https://www.haskell.org/ghc/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 +ONLY_FOR_ARCHS= aarch64 amd64 i386 USES= autoreconf compiler:c11 gmake \ ncurses perl5 python:build shebangfix \ @@ -203,15 +203,6 @@ post-patch: ${PATCHDIR}/UserSettings.hs > ${WRKSRC}/hadrian/src/UserSettings.hs .endif -.if ${BOOT_GHC_VERSION:C/\..*//g} < 9 -# TODO: remove this after rerolling all bootstraps -post-patch-BOOT-off: - @${REINPLACE_CMD} -e '/^mandir/d' ${BOOT_DIR}/mk/build.mk - @${REINPLACE_CMD} -e '/^infodir/d' ${BOOT_DIR}/mk/build.mk - @${REINPLACE_CMD} -e '/^docdir/d' ${BOOT_DIR}/mk/build.mk - @${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk -.endif - pre-configure: # Call the bootstrap script cd ${WRKSRC}/ && ${BOOT_SCRIPT} diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index e198d4149e7a..f9f7e29fdcd8 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1685194345 +TIMESTAMP = 1685194346 SHA256 (ghc-9.4.5-src.tar.xz) = 6256cf9caf6d6dc7b611dcfbb247df2d528e85aa39d22a698e870e5a590e8601 SIZE (ghc-9.4.5-src.tar.xz) = 28641296 SHA256 (ghc-9.2.8-src.tar.xz) = 5f13d1786bf4fd12f4b45faa37abedb5bb3f36d5e58f7da5307e8bfe88a567a1 @@ -15,9 +15,5 @@ SHA256 (ghc-8.10.7-boot-amd64-freebsd.tar.xz) = 5adfeceee2c3aa1208da174390cbb8e8 SIZE (ghc-8.10.7-boot-amd64-freebsd.tar.xz) = 70607916 SHA256 (ghc-8.10.7-boot-i386-freebsd.tar.xz) = d841a6abf2b97e34feb9c71a85520a78dd667bfb6d6a7f401fa8a92b558928dc SIZE (ghc-8.10.7-boot-i386-freebsd.tar.xz) = 70040192 -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 (ghc-8.10.7-boot-aarch64-freebsd.tar.xz) = f1bc49999d0db33fbf7ada6696ebebe1639126924c89deed83539850c435e23c +SIZE (ghc-8.10.7-boot-aarch64-freebsd.tar.xz) = 124950584