aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Popov <arrowd@FreeBSD.org>2020-02-19 18:30:06 +0000
committerGleb Popov <arrowd@FreeBSD.org>2020-02-19 18:30:06 +0000
commit824fb9995a67d20367fdd38199c860630470f62a (patch)
tree49c12709d573d41c8daa3a9f360774a1a4151578
parentc3303d3ec17f04ffef4ede2a481622b0b983b6a1 (diff)
downloadports-824fb9995a67d20367fdd38199c860630470f62a.tar.gz
ports-824fb9995a67d20367fdd38199c860630470f62a.zip
lang/ghc: Now that we use different bootstraps, do not apply ino64 hack anymore.
Unbreaks build on 12.1+ PR: 244217
Notes
Notes: svn path=/head/; revision=526523
-rw-r--r--lang/ghc/Makefile17
-rw-r--r--lang/ghc/distinfo4
2 files changed, 2 insertions, 19 deletions
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index be0afc3ede55..2510c0d17127 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -205,13 +205,6 @@ CONFIGURE_ARGS+= --with-ghc=${LOCALBASE}/bin/ghc
SLAVES_PREFIX= ${WRKDIR}/slaves_prefix
SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix
-post-extract:
-# Use the "wrap" trick on arches that have to use pre-ino64 bootstrap binaries
-.if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 && \
- (${ARCH} == amd64 || ${ARCH} == i386)
- @${REINPLACE_CMD} -e 's|@SettingsCCompilerLinkFlags@|& -Wl,--wrap=readdir_r,--wrap=stat,--wrap=lstat,--wrap=fstat,--wrap=mknod|' ${BOOT_DIR}/settings.in
-.endif
-
# %%PORTDOCS%%%%DOCSDIR%%/html/libraries/doc-index-V.html
post-install-script:
${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E \
@@ -262,16 +255,6 @@ pre-configure: apply-slist
# Copy the subbed build.mk to the proper position
${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk
-# Use the "wrap" trick on arches that have to use pre-ino64 bootstrap binaries
-.if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && \
- ${OSVERSION} >= 1200031 && \
- (${ARCH} == amd64 || ${ARCH} == i386)
- ${CC} ${CFLAGS} -c -o ${BOOT_DIR}/wrap.o ${PATCHDIR}/wrap.c
- for x in ${BOOT_DIR}/rts/dist/build/libCffi*.a; do \
- ${AR} q $$x ${BOOT_DIR}/wrap.o; ${RANLIB} $$x; \
- done
- ${RM} ${BOOT_DIR}/wrap.o
-.endif
# If we are using bootstrap compiler, configure and install it into ${BOOT_DIR}
.if empty(PORT_OPTIONS:MBOOT)
cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} --prefix=${BOOT_DIR}
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index a97c41721aff..bf609dde6297 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -13,8 +13,8 @@ SHA256 (ghc-8.4.3-src.tar.xz) = ae47afda985830de8811243255aa3744dfb9207cb980af74
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) = cd208fbb6b2a158ff8c5d6227e0babd8c224867ea301abf970dc446f04c9e95f
-SIZE (ghc-8.6.5-boot-i386-freebsd.tar.xz) = 67439136
+SHA256 (ghc-8.6.5-boot-i386-freebsd.tar.xz) = 47cc24cdcfa19601bb81a7f5660d1d72fec1110119e8ffe1daa0cddc7959206f
+SIZE (ghc-8.6.5-boot-i386-freebsd.tar.xz) = 67522080
SHA256 (ghc-8.6.5-boot-amd64-freebsd11.tar.xz) = 07d4c54a70900128e24b5dd9b22d929ddcf530d911a8be93e694cd9a721f458a
SIZE (ghc-8.6.5-boot-amd64-freebsd11.tar.xz) = 68965716
SHA256 (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = cd208fbb6b2a158ff8c5d6227e0babd8c224867ea301abf970dc446f04c9e95f