From owner-svn-ports-head@freebsd.org Wed Dec 4 05:31:56 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 79C891C9DB3;
Wed, 4 Dec 2019 05:31:56 +0000 (UTC)
(envelope-from arrowd@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)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 47SSCJ2QwKz4Qjg;
Wed, 4 Dec 2019 05:31:56 +0000 (UTC)
(envelope-from arrowd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F94B2358C;
Wed, 4 Dec 2019 05:31:56 +0000 (UTC)
(envelope-from arrowd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB45VtGI043310;
Wed, 4 Dec 2019 05:31:55 GMT (envelope-from arrowd@FreeBSD.org)
Received: (from arrowd@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB45Vt2A043308;
Wed, 4 Dec 2019 05:31:55 GMT (envelope-from arrowd@FreeBSD.org)
Message-Id: <201912040531.xB45Vt2A043308@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arrowd set sender to
arrowd@FreeBSD.org using -f
From: Gleb Popov <arrowd@FreeBSD.org>
Date: Wed, 4 Dec 2019 05:31:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r518988 - head/lang/ghc
X-SVN-Group: ports-head
X-SVN-Commit-Author: arrowd
X-SVN-Commit-Paths: head/lang/ghc
X-SVN-Commit-Revision: 518988
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Dec 2019 05:31:56 -0000
Author: arrowd
Date: Wed Dec 4 05:31:55 2019
New Revision: 518988
URL: https://svnweb.freebsd.org/changeset/ports/518988
Log:
lang/ghc: Unbreak on powerpc64-elfv1.
Submitted by: Mikael Urankar <mikael.urankar@gmail.com>
Reviewed by: pkubaj
Differential Revision: https://reviews.freebsd.org/D22633
Modified:
head/lang/ghc/Makefile
head/lang/ghc/distinfo
Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile Wed Dec 4 04:44:08 2019 (r518987)
+++ head/lang/ghc/Makefile Wed Dec 4 05:31:55 2019 (r518988)
@@ -143,10 +143,9 @@ _EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-dyn
.include <bsd.port.options.mk>
.if empty(PORT_OPTIONS:MBOOT)
-. if ${ARCH} == powerpc64 && ${OSVERSION} < 1300040
-ELF_V= -elfv1
-. endif
-DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${ELF_V}${EXTRACT_SUFX}:boot
+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
.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
@@ -251,8 +250,7 @@ post-patch:
@${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk
.endif
-# XXX osversion powerpc64 elfv2
-.if ${OSVERSION} >= 1300040
+.if ${ARCH} == powerpc64 && ${PPC_ABI} == ELFv2
@${REINPLACE_CMD} -e 's/ELF_V1/ELF_V2/' \
${WRKSRC}/configure ${WRKSRC}/aclocal.m4
.endif
Modified: head/lang/ghc/distinfo
==============================================================================
--- head/lang/ghc/distinfo Wed Dec 4 04:44:08 2019 (r518987)
+++ head/lang/ghc/distinfo Wed Dec 4 05:31:55 2019 (r518988)
@@ -21,8 +21,8 @@ SHA256 (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 5260987
SIZE (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 113748008
SHA256 (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 765d01199ceb0dfa5c84de692cec427e67ae1cf1ba6e1fc20e7ca854c6ceb556
SIZE (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 114046668
-SHA256 (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = d05431053aeabe9a284439e1ebb4e0a58587cc14f9e5f6250b1b1e4476c4ec83
-SIZE (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = 107059040
+SHA256 (ghc-8.6.3-boot-powerpc64-freebsd-elfv2.tar.xz) = d05431053aeabe9a284439e1ebb4e0a58587cc14f9e5f6250b1b1e4476c4ec83
+SIZE (ghc-8.6.3-boot-powerpc64-freebsd-elfv2.tar.xz) = 107059040
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 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d