svn commit: r518988 - head/lang/ghc
Gleb Popov
arrowd at FreeBSD.org
Wed Dec 4 05:31:56 UTC 2019
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 at 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
More information about the svn-ports-all
mailing list