Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Mar 2020 18:15:40 +0000 (UTC)
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r528369 - head/lang/ghc
Message-ID:  <202003131815.02DIFeZM075243@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arrowd
Date: Fri Mar 13 18:15:40 2020
New Revision: 528369
URL: https://svnweb.freebsd.org/changeset/ports/528369

Log:
  lang/ghc: Unhreak on powerpc64 by using new bootstrap compiler.
  
  PR:		244788
  Submitted by:	pkubaj

Modified:
  head/lang/ghc/Makefile
  head/lang/ghc/distinfo

Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile	Fri Mar 13 17:53:44 2020	(r528368)
+++ head/lang/ghc/Makefile	Fri Mar 13 18:15:40 2020	(r528369)
@@ -86,7 +86,7 @@ ONLY_FOR_ARCHS+=	aarch64 armv6 armv7 powerpc64
 .include <bsd.port.pre.mk>
 
 # This version of ncurses is needed by bootstrap compiler
-.if ${OSVERSION} > 1300078 && empty(PORT_OPTIONS:MBOOT)
+.if ${OSVERSION} > 1300078 && empty(PORT_OPTIONS:MBOOT) && ${ARCH} != powerpc64
 BUILD_DEPENDS+=	${LOCALBASE}/lib/compat/libncursesw.so.8:misc/compat12x
 .endif
 
@@ -102,7 +102,7 @@ LLVM_VERSION=		60
 CONFIGURE_ARGS+=	--enable-dtrace=0
 .endif
 
-.if ${ARCH} == amd64 || ${ARCH} == i386
+.if ${ARCH} == amd64 || ${ARCH} == i386 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2)
 BOOT_GHC_VERSION=	8.6.5
 .else
 BOOT_GHC_VERSION=	8.6.3

Modified: head/lang/ghc/distinfo
==============================================================================
--- head/lang/ghc/distinfo	Fri Mar 13 17:53:44 2020	(r528368)
+++ head/lang/ghc/distinfo	Fri Mar 13 18:15:40 2020	(r528369)
@@ -25,8 +25,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-elfv2.tar.xz) = d05431053aeabe9a284439e1ebb4e0a58587cc14f9e5f6250b1b1e4476c4ec83
-SIZE (ghc-8.6.3-boot-powerpc64-freebsd-elfv2.tar.xz) = 107059040
+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 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003131815.02DIFeZM075243>