From owner-svn-ports-all@freebsd.org Wed Feb 19 18:30:07 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 35EDB2419A2; Wed, 19 Feb 2020 18:30:07 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48N5qg03P6z4CMp; Wed, 19 Feb 2020 18:30:07 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F0F7ACF49; Wed, 19 Feb 2020 18:30:06 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01JIU6g8031631; Wed, 19 Feb 2020 18:30:06 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01JIU6i2031630; Wed, 19 Feb 2020 18:30:06 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <202002191830.01JIU6i2031630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Wed, 19 Feb 2020 18:30:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526523 - head/lang/ghc X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: head/lang/ghc X-SVN-Commit-Revision: 526523 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Feb 2020 18:30:07 -0000 Author: arrowd Date: Wed Feb 19 18:30:06 2020 New Revision: 526523 URL: https://svnweb.freebsd.org/changeset/ports/526523 Log: lang/ghc: Now that we use different bootstraps, do not apply ino64 hack anymore. Unbreaks build on 12.1+ PR: 244217 Modified: head/lang/ghc/Makefile head/lang/ghc/distinfo Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Wed Feb 19 18:19:30 2020 (r526522) +++ head/lang/ghc/Makefile Wed Feb 19 18:30:06 2020 (r526523) @@ -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} Modified: head/lang/ghc/distinfo ============================================================================== --- head/lang/ghc/distinfo Wed Feb 19 18:19:30 2020 (r526522) +++ head/lang/ghc/distinfo Wed Feb 19 18:30:06 2020 (r526523) @@ -13,8 +13,8 @@ SHA256 (ghc-8.4.3-src.tar.xz) = ae47afda985830de881124 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