Date: Sat, 1 Jul 2023 14:10:36 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: fd5e0843391c - main - lang/ghc: Reroll Aarch64 8.10.7 bootstrap and simplify Makefile. Message-ID: <202307011410.361EAaiu049157@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=fd5e0843391c41b3f9062b2c1ebf58f4f0fc20be commit fd5e0843391c41b3f9062b2c1ebf58f4f0fc20be Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-07-01 14:09:11 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307011410.361EAaiu049157>