svn commit: r545123 - in head/lang/ghc: . files843 files844 files862 files863 files864 files865
Gleb Popov
arrowd at FreeBSD.org
Sun Aug 16 16:26:24 UTC 2020
Author: arrowd
Date: Sun Aug 16 16:26:24 2020
New Revision: 545123
URL: https://svnweb.freebsd.org/changeset/ports/545123
Log:
lang/ghc: Remove support for building old versions by overriding GHC_VERSION variable.
It turned out that I never used this feature since it was added.
Deleted:
head/lang/ghc/files843/
head/lang/ghc/files844/
head/lang/ghc/files862/
head/lang/ghc/files863/
head/lang/ghc/files864/
head/lang/ghc/files865/
Modified:
head/lang/ghc/Makefile
head/lang/ghc/distinfo
Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile Sun Aug 16 15:01:55 2020 (r545122)
+++ head/lang/ghc/Makefile Sun Aug 16 16:26:24 2020 (r545123)
@@ -17,8 +17,7 @@ COMMENT= Compiler for the functional language Haskell
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-# other supported arches are added based on GHC_VERSION below
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS= amd64 i386 aarch64 armv6 armv7 powerpc64
USES= autoreconf compiler:c11 gmake iconv:translit \
localbase:ldflags ncurses perl5 tar:xz
@@ -71,6 +70,8 @@ BOOT_SUB_LIST_OFF= HSC2HS=${BOOT_HSC2HS}
PROFILE_SUB_LIST= WITH_PROFILE="YES"
PROFILE_SUB_LIST_OFF= WITH_PROFILE="NO"
+PLIST_SUB= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL}
+
GHC_VERSION?= ${GHC_VERSION_DEFAULT}
GHC_VERSION_DEFAULT= 8.10.1
GHC_VERSION_MAJOR= ${GHC_VERSION:S/./ /g:[1]}
@@ -78,9 +79,9 @@ GHC_VERSION_MINOR= ${GHC_VERSION:S/./ /g:[2]}
HSCOLOUR_VERSION= 1.24.4
-.if ${GHC_VERSION_MAJOR} >= 8 && ${GHC_VERSION_MINOR} >= 6
-ONLY_FOR_ARCHS+= aarch64 armv6 armv7 powerpc64
-.endif
+LLVM_VERSION= 90
+# LLVM version that bootstrap compiler uses
+BOOT_LLVM_VERSION= 60
.include <bsd.port.pre.mk>
@@ -89,18 +90,6 @@ ONLY_FOR_ARCHS+= aarch64 armv6 armv7 powerpc64
BUILD_DEPENDS+= ${LOCALBASE}/lib/compat/libncursesw.so.8:misc/compat12x
.endif
-.if ${GHC_VERSION_MAJOR} == 8 && ${GHC_VERSION_MINOR} == 4
-LLVM_VERSION= 50
-# Turn off for old GHCs, see PR 228727
-CONFIGURE_ARGS+= --enable-dtrace=0
-.elif ${GHC_VERSION_MAJOR} == 8 && ${GHC_VERSION_MINOR} == 6
-LLVM_VERSION= 60
-.elif ${GHC_VERSION_MAJOR} == 8 && ${GHC_VERSION_MINOR} == 8
-LLVM_VERSION= 70
-.else # ghc 8.10
-LLVM_VERSION= 90
-.endif
-
.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --enable-dtrace=0
.endif
@@ -114,13 +103,7 @@ BOOT_GHC_VERSION= 8.6.3
.else
BOOT_GHC_VERSION= 8.6.5
.endif
-# LLVM version that bootstrap compiler uses
-BOOT_LLVM_VERSION= 60
-.if "${GHC_VERSION}" != "${GHC_VERSION_DEFAULT}"
-PATCHDIR= ${.CURDIR}/files${GHC_VERSION:S/.//g}/
-.endif
-
NO_CCACHE= ccache: error: Failed to create directory /nonexistent/.ccache/tmp: Permission denied
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
@@ -182,14 +165,6 @@ IGNORE= qemu-user-static isn't able to build lang/ghc,
. endif
.endif
-PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL}
-
-.if ${GHC_VERSION_MAJOR} <= 8 && ${GHC_VERSION_MINOR} < 8
-WITH_GHC= --with-ghc
-.else
-WITH_GHC= GHC
-.endif
-
.if empty(PORT_OPTIONS:MBOOT)
BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
BOOT_GHC= ${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION}
@@ -198,16 +173,12 @@ BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs
SLAVE_ENV= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
-CONFIGURE_ARGS+= ${WITH_GHC}=${BOOT_GHC}
+CONFIGURE_ARGS+= GHC=${BOOT_GHC}
.else # MBOOT
SLAVE_ENV= # empty
-CONFIGURE_ARGS+= ${WITH_GHC}=${LOCALBASE}/bin/ghc
+CONFIGURE_ARGS+= GHC=${LOCALBASE}/bin/ghc
.endif # MBOOT
-# override TMPDIR because /tmp often doesn't have enough space
-# to build some of the larger libraries.
-#TMPDIR= ${WRKSRC}/tmp
-
SLAVES_PREFIX= ${WRKDIR}/slaves_prefix
SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix
@@ -237,10 +208,6 @@ post-patch:
s|%%AR%%|${AR}|; \
s|%%LD%%|${LD}|' \
${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
-.if ${GHC_VERSION_MAJOR} <= 8 && ${GHC_VERSION_MINOR} < 10
- @${REINPLACE_CMD} -e 's/@SettingsLlcCommand@/llc${LLVM_VERSION}/' ${WRKSRC}/settings.in
- @${REINPLACE_CMD} -e 's/@SettingsOptCommand@/opt${LLVM_VERSION}/' ${WRKSRC}/settings.in
-.endif
.if empty(PORT_OPTIONS:MBOOT)
@${REINPLACE_CMD} -e '/^mandir/d' ${BOOT_DIR}/mk/build.mk
Modified: head/lang/ghc/distinfo
==============================================================================
--- head/lang/ghc/distinfo Sun Aug 16 15:01:55 2020 (r545122)
+++ head/lang/ghc/distinfo Sun Aug 16 16:26:24 2020 (r545123)
@@ -1,18 +1,6 @@
TIMESTAMP = 1588674714
SHA256 (ghc-8.10.1-src.tar.xz) = 4e3b07f83a266b3198310f19f71e371ebce97c769b14f0d688f4cbf2a2a1edf5
SIZE (ghc-8.10.1-src.tar.xz) = 19781652
-SHA256 (ghc-8.6.5-src.tar.xz) = 4d4aa1e96f4001b934ac6193ab09af5d6172f41f5a5d39d8e43393b9aafee361
-SIZE (ghc-8.6.5-src.tar.xz) = 19092168
-SHA256 (ghc-8.6.4-src.tar.xz) = 5b5d07e4463203a433c3ed3df461ba6cce11b6d2b9b264db31f3429075d0303a
-SIZE (ghc-8.6.4-src.tar.xz) = 19029904
-SHA256 (ghc-8.6.3-src.tar.xz) = 9f9e37b7971935d88ba80426c36af14b1e0b3ec1d9c860f44a4391771bc07f23
-SIZE (ghc-8.6.3-src.tar.xz) = 19138116
-SHA256 (ghc-8.6.2-src.tar.xz) = caaa819d21280ecde90a4773143dee188711e9ff175a27cfbaee56eb851d76d5
-SIZE (ghc-8.6.2-src.tar.xz) = 19024236
-SHA256 (ghc-8.4.4-src.tar.xz) = 11117735a58e507c481c09f3f39ae5a314e9fbf49fc3109528f99ea7959004b2
-SIZE (ghc-8.4.4-src.tar.xz) = 11319500
-SHA256 (ghc-8.4.3-src.tar.xz) = ae47afda985830de8811243255aa3744dfb9207cb980af74393298b2b62160d6
-SIZE (ghc-8.4.3-src.tar.xz) = 11315068
SHA256 (ghc-8.6.5-boot-amd64-freebsd.tar.xz) = aeaf8c0fee0d83de5088aa7ab92e92ee6999b4830e01e33bf3dd450b115c0208
SIZE (ghc-8.6.5-boot-amd64-freebsd.tar.xz) = 70213260
SHA256 (ghc-8.6.5-boot-i386-freebsd.tar.xz) = 47cc24cdcfa19601bb81a7f5660d1d72fec1110119e8ffe1daa0cddc7959206f
More information about the svn-ports-head
mailing list