Skip to content

Commit

Permalink
lang/ghc: Unbreak GHC 9.2 on AArch64, refresh bootstraps.
Browse files Browse the repository at this point in the history
  • Loading branch information
arrowd committed Jan 3, 2024
1 parent 4ca4ff9 commit 81be046
Show file tree
Hide file tree
Showing 5 changed files with 9,856 additions and 9,853 deletions.
9 changes: 5 additions & 4 deletions lang/ghc/Makefile
Expand Up @@ -73,7 +73,7 @@ PROFILE_VARS_OFF= enable_profile=NO hadrian_setting_profile=False

GHC_VERSION?= 9.4.7
LLVM_VERSION?= 13
BOOT_GHC_VERSION?= 9.2.7
BOOT_GHC_VERSION?= 9.2.8
# LLVM version that bootstrap compiler uses
BOOT_LLVM_VERSION?= 12

Expand Down Expand Up @@ -106,7 +106,7 @@ BUILD_MK= DYNAMIC_GHC_PROGRAMS=${ENABLE_DYNAMIC} \

.include <bsd.port.pre.mk>

.if ${GHC_VERSION:C/\..*//g} >= 9 && ${ARCH} != i386 && ${ARCH} != aarch64
.if ${GHC_VERSION:C/\..*//g} >= 9 && ${ARCH} != i386
# hadrian build on i386 fails due to https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269570
# relocation R_386_TLS_LE cannot be used with -shared
USE_HADRIAN= yes
Expand All @@ -115,7 +115,6 @@ USE_HADRIAN= yes
.if ${GHC_VERSION:C/\..*//g} >= 9 && ${GHC_VERSION:C/[^\.]*\.//:C/\..*//g} >= 4
BOOT_SCRIPT= ./boot.source
IGNORE_i386= requires Hadrian build which doesn't work on i386
IGNORE_aarch64= requires Hadrian build which doesn't work on aarch64
.else
BOOT_SCRIPT= ./boot
.endif
Expand Down Expand Up @@ -153,6 +152,8 @@ BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
BOOT_INSTALL_DIR= ${WRKDIR}/ghc-boot-install
BOOT_GHC= ${BOOT_INSTALL_DIR}/bin/ghc-${BOOT_GHC_VERSION}

PLIST_SUB+= GHC_ARCH=${GHC_ARCH}

.if ${BOOT_GHC_VERSION:C/\..*//g} >= 9
BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-${CONFIGURE_TARGET}
.endif
Expand Down Expand Up @@ -277,7 +278,7 @@ create-bootstrap:
.else
cd ${WRKSRC} \
&& ${HADRIAN_CMD} binary-dist-xz \
&& ${MV} ${WRKSRC}/_build/bindist/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
&& ${MV} ${WRKSRC}/_build/bindist/ghc-${GHC_VERSION}-${CONFIGURE_TARGET}.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
.endif

@cd /tmp \
Expand Down
10 changes: 6 additions & 4 deletions lang/ghc/distinfo
Expand Up @@ -5,15 +5,17 @@ SHA256 (ghc-9.2.8-src.tar.xz) = 5f13d1786bf4fd12f4b45faa37abedb5bb3f36d5e58f7da5
SIZE (ghc-9.2.8-src.tar.xz) = 24661260
SHA256 (ghc-8.10.7-src.tar.xz) = e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
SIZE (ghc-8.10.7-src.tar.xz) = 19932668
SHA256 (hadrian-9.4.7-boot.tar.gz) = 6025ed88506d216ae2a5155c59e92821d3382858047b6190ba1676c02b1641e0
SIZE (hadrian-9.4.7-boot.tar.gz) = 1495510
SHA256 (hadrian-9.4.7-boot.tar.gz) = c02aa82df3c2636ca2dc6c5c5a873a13ae06937221e595ab95a2d3ccd43ae2d6
SIZE (hadrian-9.4.7-boot.tar.gz) = 1495521
SHA256 (hadrian-9.2.8-boot.tar.gz) = 730412e1c17309670075be8f76dbca9ebadedfa10b758e605f9e67804e9e8ac5
SIZE (hadrian-9.2.8-boot.tar.gz) = 1473009
SHA256 (ghc-9.2.7-boot-amd64-freebsd.tar.xz) = 4cd2ca8d7afd0fe3f83133d9a07b953bd7f331e5a70caf5401087e62840b6c89
SIZE (ghc-9.2.7-boot-amd64-freebsd.tar.xz) = 118471240
SHA256 (ghc-9.2.8-boot-amd64-freebsd.tar.xz) = 8b172a963e316a57906edb7914be765021337a685e578bc3303db072aee3eb16
SIZE (ghc-9.2.8-boot-amd64-freebsd.tar.xz) = 117864544
SHA256 (ghc-8.10.7-boot-amd64-freebsd.tar.xz) = bde05fc239d962a4caea55d8c51a249145ef9a91695214b189078603d95e9b5b
SIZE (ghc-8.10.7-boot-amd64-freebsd.tar.xz) = 70284268
SHA256 (ghc-8.10.7-boot-i386-freebsd.tar.xz) = b9b50875143311425d6f1b35d21d2d4d4d6e3beb8159b90adcc2440d77ecd30d
SIZE (ghc-8.10.7-boot-i386-freebsd.tar.xz) = 69555468
SHA256 (ghc-9.2.8-boot-aarch64-freebsd.tar.xz) = 23da026e3a9f1a4569aa7a464be016fc39b05afc9209e0d7662e151260b4964c
SIZE (ghc-9.2.8-boot-aarch64-freebsd.tar.xz) = 124830556
SHA256 (ghc-8.10.7-boot-aarch64-freebsd.tar.xz) = f1bc49999d0db33fbf7ada6696ebebe1639126924c89deed83539850c435e23c
SIZE (ghc-8.10.7-boot-aarch64-freebsd.tar.xz) = 124950584
Expand Up @@ -191,7 +191,7 @@
},
{
"package": "ghc-boot-th",
"version": "9.2.7"
"version": "9.2.8"
},
{
"package": "pretty",
Expand Down

0 comments on commit 81be046

Please sign in to comment.