From nobody Sun Oct 17 20:24:32 2021 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 65C0217F65D9; Sun, 17 Oct 2021 20:24:33 +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 4HXWh11bQkz3nH4; Sun, 17 Oct 2021 20:24:33 +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 02423135EE; Sun, 17 Oct 2021 20:24:33 +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 19HKOWDF042358; Sun, 17 Oct 2021 20:24:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19HKOW1l042357; Sun, 17 Oct 2021 20:24:32 GMT (envelope-from git) Date: Sun, 17 Oct 2021 20:24:32 GMT Message-Id: <202110172024.19HKOW1l042357@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: 852fb7f3bc65 - main - lang/ghc: Remove powerpc64 support. 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: 852fb7f3bc654c8aac6803be05b83079dad36889 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=852fb7f3bc654c8aac6803be05b83079dad36889 commit 852fb7f3bc654c8aac6803be05b83079dad36889 Author: Gleb Popov AuthorDate: 2021-10-17 13:32:57 +0000 Commit: Gleb Popov CommitDate: 2021-10-17 20:24:25 +0000 lang/ghc: Remove powerpc64 support. It was reported as broken by pkubaj. --- lang/ghc/Makefile | 18 +++++------------- lang/ghc/distinfo | 4 ---- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 03bfac0c7b35..74986685a98d 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -16,7 +16,7 @@ COMMENT= Compiler for the functional language Haskell LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= amd64 i386 aarch64 armv6 armv7 powerpc64 +ONLY_FOR_ARCHS= amd64 i386 aarch64 armv6 armv7 USES= autoreconf compiler:c11 gmake iconv:patch,translit \ localbase:ldflags ncurses perl5 tar:xz @@ -87,17 +87,15 @@ PORTDOCS= * CONFIGURE_TARGET= ${GHC_ARCH}-portbld-${OPSYS:tl} # This version of ncurses is needed by bootstrap compiler -.if ${OSVERSION} > 1300078 && empty(PORT_OPTIONS:MBOOT) && ${ARCH} != powerpc64 +.if ${OSVERSION} > 1300078 && empty(PORT_OPTIONS:MBOOT) BUILD_DEPENDS+= ${LOCALBASE}/lib/compat/libncursesw.so.8:misc/compat12x .endif -.if ${ARCH} == powerpc64 || ${OSVERSION} >= 1400018 +.if ${OSVERSION} >= 1400018 CONFIGURE_ARGS+= --enable-dtrace=0 .endif -.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 -BOOT_GHC_VERSION= 8.6.3 -.elif ${ARCH} == aarch64 || ${ARCH:Marmv*} +.if ${ARCH} == aarch64 || ${ARCH:Marmv*} BOOT_GHC_VERSION= 8.10.7 .else BOOT_GHC_VERSION= 8.6.5 @@ -131,7 +129,6 @@ _EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-dyn .if empty(PORT_OPTIONS:MBOOT) BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} -BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl} DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:boot .endif # MBOOT @@ -150,7 +147,7 @@ BUILD_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} . endif .endif -.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH} == powerpc64 +.if ${ARCH} == aarch64 || ${ARCH:Marmv*} . ifdef QEMU_EMULATING IGNORE= qemu-user-static isn't able to build lang/ghc, but it builds fine on a real hardware . endif @@ -181,11 +178,6 @@ post-patch: @${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk .endif -.if ${ARCH} == powerpc64 && ${PPC_ABI} == ELFv2 - @${REINPLACE_CMD} -e 's/ELF_V1/ELF_V2/' \ - ${WRKSRC}/configure ${WRKSRC}/aclocal.m4 -.endif - pre-configure: # Copy the subbed build.mk to the proper position ${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index fb17ff9cd026..187690e5a767 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -13,10 +13,6 @@ SHA256 (ghc-8.10.4-boot-armv6-freebsd.tar.xz) = 04b207b787bdff71028b8d4c311a4710 SIZE (ghc-8.10.4-boot-armv6-freebsd.tar.xz) = 148679080 SHA256 (ghc-8.10.4-boot-armv7-freebsd.tar.xz) = db94e69b83a93fba9c136e890ccb0bf76b6d163ac3979dadb1568e81c3267744 SIZE (ghc-8.10.4-boot-armv7-freebsd.tar.xz) = 149265452 -SHA256 (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 89dfbfab84aef489ca9d0ff6fdf97152cff2412f6a8b9b1e57025b2019908318 -SIZE (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 113782560 -SHA256 (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4 -SIZE (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = 112652192 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