Received: by mail.netbsd.org (Postfix, from userid 605) id E82D984E36; Mon, 13 Jan 2020 14:15:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 89E3384E24 for ; Mon, 13 Jan 2020 14:15:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Hyvk6HeIthh2 for ; Mon, 13 Jan 2020 14:15:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D0CA584E2B for ; Mon, 13 Jan 2020 14:15:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CA507FBF4; Mon, 13 Jan 2020 14:15:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157892491117770" MIME-Version: 1.0 Date: Mon, 13 Jan 2020 14:15:11 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/lang/ghc84 To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20200113141511.CA507FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157892491117770 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Mon Jan 13 14:15:11 UTC 2020 Modified Files: pkgsrc/lang/ghc84: Makefile bootstrap.mk buildlink3.mk distinfo Log Message: Bootkit for FreeBSD/i386 is now on LOCAL_PORTS To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ghc84/Makefile \ pkgsrc/lang/ghc84/bootstrap.mk pkgsrc/lang/ghc84/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ghc84/buildlink3.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157892491117770 Content-Disposition: inline Content-Length: 5900 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ghc84/Makefile diff -u pkgsrc/lang/ghc84/Makefile:1.2 pkgsrc/lang/ghc84/Makefile:1.3 --- pkgsrc/lang/ghc84/Makefile:1.2 Sun Jan 12 06:12:07 2020 +++ pkgsrc/lang/ghc84/Makefile Mon Jan 13 14:15:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2020/01/12 06:12:07 pho Exp $ +# $NetBSD: Makefile,v 1.3 2020/01/13 14:15:11 pho Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -22,7 +22,7 @@ CONFLICTS+= ghc-[0-9]* # BOOTSTRAP.txt and ./bootstrap.mk #BROKEN_EXCEPT_ON_PLATFORM+= Darwin-*-powerpc # Not available yet BROKEN_EXCEPT_ON_PLATFORM+= Darwin-*-x86_64 -#BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-i386 # Not available yet +BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-i386 BROKEN_EXCEPT_ON_PLATFORM+= NetBSD-*-x86_64 #BROKEN_EXCEPT_ON_PLATFORM+= SunOS-*-i386 # Not available yet #BROKEN_EXCEPT_ON_PLATFORM+= SunOS-*-x86_64 # Not available yet Index: pkgsrc/lang/ghc84/bootstrap.mk diff -u pkgsrc/lang/ghc84/bootstrap.mk:1.2 pkgsrc/lang/ghc84/bootstrap.mk:1.3 --- pkgsrc/lang/ghc84/bootstrap.mk:1.2 Sun Jan 12 06:12:07 2020 +++ pkgsrc/lang/ghc84/bootstrap.mk Mon Jan 13 14:15:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.2 2020/01/12 06:12:07 pho Exp $ +# $NetBSD: bootstrap.mk,v 1.3 2020/01/13 14:15:11 pho Exp $ # ----------------------------------------------------------------------------- # Select a bindist of bootstrapping compiler on a per-platform basis. # @@ -31,9 +31,9 @@ DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} .endif .if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) -#BOOT_VERSION:= 8.0.2 -#BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-i386-unknown-freebsd.tar.xz -#DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS +BOOT_VERSION:= 8.4.4 +BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-i386-unknown-freebsd.tar.xz +DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS .endif .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) @@ -73,16 +73,6 @@ SITES.${i}?= ${MASTER_SITE_LOCAL} CONFLICTS+= libelf-[0-9]* .endif -# FreeBSD < 10 surprisingly doesn't have a native iconv so we need to -# use pkgsrc libiconv for this OPSYS. And if a bootkit depends on -# pkgsrc libiconv, the "normal" build must do the same because GHC -# always needs to link executables with libiconv, just like libgmp -# when integer-gmp is used. For this reason it might be desirable to -# create two separate bootkits, one for < 10 and another for >= 10. -.if ${OPSYS} == "FreeBSD" -USE_BUILTIN.iconv= no -.endif - # current bootstrap binary kit for SmartOS is built with ncurses5 .if !empty(MACHINE_PLATFORM:MSunOS-*) && ${OS_VARIANT:U} == "SmartOS" BUILD_DEPENDS+= ncurses>=5.0:../../devel/ncurses Index: pkgsrc/lang/ghc84/distinfo diff -u pkgsrc/lang/ghc84/distinfo:1.2 pkgsrc/lang/ghc84/distinfo:1.3 --- pkgsrc/lang/ghc84/distinfo:1.2 Sun Jan 12 06:12:07 2020 +++ pkgsrc/lang/ghc84/distinfo Mon Jan 13 14:15:11 2020 @@ -1,5 +1,9 @@ -$NetBSD: distinfo,v 1.2 2020/01/12 06:12:07 pho Exp $ +$NetBSD: distinfo,v 1.3 2020/01/13 14:15:11 pho Exp $ +SHA1 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 04981802730423aa12999e59679be198d540222a +RMD160 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = f617e67f2c2f07c7211cb391a4bc2e7b304045e2 +SHA512 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 0819d9d9cd73688c143812c703e8394c9010e9e81c03a69c81f6bcc784f262ec04bffb9d8f2d030209f2f1a05ccddfb46c36fe789936e2b850920bf08052448f +Size (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 52125656 bytes SHA1 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 688f5729992bd2476699d9067d97e79b06bdec60 RMD160 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 4e9c52c8ef07343cc24528e3f8431754237d0be3 SHA512 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = abc92ca6822ba7fe2d09bc381a833c0cbd5f436b517fba003736195cec45f8ce2e33623a587ad35f5702baac791594d62fc829e2ea4dfceae2455875661b3ba6 @@ -19,8 +23,8 @@ SHA1 (patch-libraries_base_System_CPUTim SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = b2811ec4a845e6b2b44414e940b6108178b597c5 -SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab +SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00 SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a +SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607 SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b -SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00 Index: pkgsrc/lang/ghc84/buildlink3.mk diff -u pkgsrc/lang/ghc84/buildlink3.mk:1.1 pkgsrc/lang/ghc84/buildlink3.mk:1.2 --- pkgsrc/lang/ghc84/buildlink3.mk:1.1 Tue Jan 7 16:52:08 2020 +++ pkgsrc/lang/ghc84/buildlink3.mk Mon Jan 13 14:15:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2020/01/07 16:52:08 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2020/01/13 14:15:11 pho Exp $ BUILDLINK_TREE+= ghc @@ -9,12 +9,6 @@ BUILDLINK_API_DEPENDS.ghc+= ghc>=8.4.4 BUILDLINK_ABI_DEPENDS.ghc+= ghc>=8.4.4 BUILDLINK_PKGSRCDIR.ghc?= ../../lang/ghc84 -# On FreeBSD we need pkgsrc libiconv. See bootstrap.mk for details. -.include "../../mk/bsd.fast.prefs.mk" -.if ${OPSYS} == "FreeBSD" -USE_BUILTIN.iconv= no -.endif - .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libffi/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" --_----------=_157892491117770--