CVS commit: pkgsrc/lang/ghc90

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/ghc90
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Mon, 26 Apr 2021 07:41:21 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Apr 26 07:41:21 UTC 2021

Modified Files:
        pkgsrc/lang/ghc90: Makefile bootstrap.mk distinfo
        pkgsrc/lang/ghc90/patches: patch-rts_ProfHeap.c
Added Files:
        pkgsrc/lang/ghc90/patches: patch-utils_haddock_driver_Main.hs

Log Message:
Add a bootkit for FreeBSD-*-i386


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ghc90/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ghc90/bootstrap.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc90/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc90/patches/patch-utils_haddock_driver_Main.hs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ghc90/Makefile
diff -u pkgsrc/lang/ghc90/Makefile:1.5 pkgsrc/lang/ghc90/Makefile:1.6
--- pkgsrc/lang/ghc90/Makefile:1.5      Fri Apr 23 00:08:02 2021
+++ pkgsrc/lang/ghc90/Makefile  Mon Apr 26 07:41:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/04/23 00:08:02 pho Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/26 07:41:21 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -25,7 +25,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  # Not available yet
-#BROKEN_EXCEPT_ON_PLATFORM+=   FreeBSD-*-i386   # Not available yet
+BROKEN_EXCEPT_ON_PLATFORM+=    FreeBSD-*-i386
 #BROKEN_EXCEPT_ON_PLATFORM+=   FreeBSD-*-x86_64 # Not available yet
 BROKEN_EXCEPT_ON_PLATFORM+=    NetBSD-*-x86_64
 #BROKEN_EXCEPT_ON_PLATFORM+=   SunOS-*-x86_64   # Not available yet

Index: pkgsrc/lang/ghc90/bootstrap.mk
diff -u pkgsrc/lang/ghc90/bootstrap.mk:1.4 pkgsrc/lang/ghc90/bootstrap.mk:1.5
--- pkgsrc/lang/ghc90/bootstrap.mk:1.4  Fri Apr 23 00:08:02 2021
+++ pkgsrc/lang/ghc90/bootstrap.mk      Mon Apr 26 07:41:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.4 2021/04/23 00:08:02 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.5 2021/04/26 07:41:21 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -32,9 +32,9 @@
 #.endif
 
 #.if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-#BOOT_VERSION:=        8.4.4
-#BOOT_ARCHIVE:=        ghc-${BOOT_VERSION}-boot-i386-unknown-freebsd.tar.xz
-#DISTFILES:=   ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
+BOOT_VERSION:= 9.0.1
+BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-i386-unknown-freebsd.tar.xz
+DISTFILES:=    ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
 #.endif
 
 #.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make(makesum) || make(mdi)

Index: pkgsrc/lang/ghc90/distinfo
diff -u pkgsrc/lang/ghc90/distinfo:1.3 pkgsrc/lang/ghc90/distinfo:1.4
--- pkgsrc/lang/ghc90/distinfo:1.3      Thu Apr 22 18:15:00 2021
+++ pkgsrc/lang/ghc90/distinfo  Mon Apr 26 07:41:21 2021
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.3 2021/04/22 18:15:00 pho Exp $
+$NetBSD: distinfo,v 1.4 2021/04/26 07:41:21 pho Exp $
 
 SHA1 (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 3ff01d768393b3866e7a7543f9f55646aaffce7a
 RMD160 (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 39bf10b13054a6316c8477609fb98abe4277fa6c
 SHA512 (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 730347bb5eaac4efac8ec487fafd2da6fe2932db45f59e324c83698eb0b0e8a6a4b4fd513de17fb9c152ccee328660cfe1638cad631ce5e35b2dbfddda0d8850
 Size (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 49500236 bytes
+SHA1 (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 4acbac13308bf08af6711d7e5c23fe561ed1ce6e
+RMD160 (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = cbd60204d7bfdf3bbc26a0f8c78683560731e070
+SHA512 (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = f243d2a091dbaa670ecaac913266e428164064e5c73a2d4e96b603f16af94f3c4af4358e01c04d492de8ddd8c4b6d25ebe8b62b929b6191cd87f0f1d13873fde
+Size (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 48912780 bytes
 SHA1 (ghc-9.0.1-src.tar.xz) = adaec1c05cd03d6af02716d59ab5f597434b700b
 RMD160 (ghc-9.0.1-src.tar.xz) = 2bed45072ccb838418ae0405f5cfe64a237315e3
 SHA512 (ghc-9.0.1-src.tar.xz) = bee7950a5118be8d8cefe0db5070139a5a93ca21c5bc6f8bf453429831f0c44f5e0fb5ee569865d6b8b92749044ee4123be06920928ac7a1ec9cffa9404a3e53
@@ -14,17 +18,18 @@ SHA512 (netbsd-9.0-amd64-libterminfo.tar
 Size (netbsd-9.0-amd64-libterminfo.tar.gz) = 27744 bytes
 SHA1 (patch-aclocal.m4) = 66d27cc50de048beeebee31302107501d5802388
 SHA1 (patch-configure.ac) = 0905a0e5358d8c3f3f8366b597a59dd824f294d8
-SHA1 (patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs) = a4c82b1282c0580a7945be8c3b9d38bc760db99f
+SHA1 (patch-libraries_base_configure) = f06a961a6507f635aafe50dab3ff4396c012bdec
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
 SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
 SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
-SHA1 (patch-libraries_base_configure) = f06a961a6507f635aafe50dab3ff4396c012bdec
+SHA1 (patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs) = a4c82b1282c0580a7945be8c3b9d38bc760db99f
 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
-SHA1 (patch-rts_ProfHeap.c) = ef3d773387efd297830a54102e368ea96b7b0adf
 SHA1 (patch-rts_posix_OSThreads.c) = d5873aad8836067b5f29b37250666e37db67a4be
+SHA1 (patch-rts_ProfHeap.c) = 38b0623effbe46e04b98fb221591b4ec329a1b37
+SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067

Index: pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c
diff -u pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c:1.2 pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c:1.3
--- pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c:1.2  Thu Apr 22 14:20:24 2021
+++ pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c      Mon Apr 26 07:41:21 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-rts_ProfHeap.c,v 1.2 2021/04/22 14:20:24 pho Exp $
+$NetBSD: patch-rts_ProfHeap.c,v 1.3 2021/04/26 07:41:21 pho Exp $
 
 NetBSD does not have uselocale(3).
 
 --- rts/ProfHeap.c.orig        2021-01-25 16:30:28.000000000 +0000
 +++ rts/ProfHeap.c
-@@ -69,7 +69,7 @@ static locale_t prof_locale = 0, saved_l
+@@ -69,7 +69,7 @@ static locale_t prof_locale = 0, saved_locale = 0;
  STATIC_INLINE void
  init_prof_locale( void )
  {
@@ -32,16 +32,12 @@ NetBSD does not have uselocale(3).
  #else
      saved_locale = uselocale(prof_locale);
  #endif
-@@ -106,9 +109,11 @@ set_prof_locale( void )
- STATIC_INLINE void
- restore_locale( void )
+@@ -108,6 +111,8 @@ restore_locale( void )
  {
--#if defined(mingw32_HOST_OS)
-+#if !defined(mingw32_HOST_OS) && !defined(netbsd_HOST_OS)
+ #if defined(mingw32_HOST_OS)
      _configthreadlocale(prof_locale_per_thread);
-     setlocale(LC_NUMERIC, saved_locale);
-+#elif defined(netbsd_HOST_OS)
 +    setlocale(LC_NUMERIC, saved_locale);
++#elif defined(netbsd_HOST_OS)
+     setlocale(LC_NUMERIC, saved_locale);
  #else
      uselocale(saved_locale);
- #endif

Added files:

Index: pkgsrc/lang/ghc90/patches/patch-utils_haddock_driver_Main.hs
diff -u /dev/null pkgsrc/lang/ghc90/patches/patch-utils_haddock_driver_Main.hs:1.1
--- /dev/null   Mon Apr 26 07:41:21 2021
+++ pkgsrc/lang/ghc90/patches/patch-utils_haddock_driver_Main.hs        Mon Apr 26 07:41:21 2021
@@ -0,0 +1,19 @@
+$NetBSD: patch-utils_haddock_driver_Main.hs,v 1.1 2021/04/26 07:41:21 pho Exp $
+
+Workaround for haddock dying when the locale isn't "*.UTF-8". Of course
+this isn't a real fix. Haddock is very fragile when it comes to locale
+setting, and fixing it properly would be seriously a lot of work.
+
+--- utils/haddock/driver/Main.hs.orig  2020-07-28 17:05:24.000000000 +0000
++++ utils/haddock/driver/Main.hs
+@@ -1,7 +1,9 @@
+ module Main where
+ 
+ import Documentation.Haddock (haddock)
++import GHC.IO.Encoding (setLocaleEncoding, utf8)
+ import GHC.ResponseFile (getArgsWithResponseFiles)
+ 
+ main :: IO ()
+-main = getArgsWithResponseFiles >>= haddock
++main = do setLocaleEncoding utf8
++          getArgsWithResponseFiles >>= haddock

Prev by Date: CVS commit: pkgsrc/finance/hledger
Next by Date: CVS commit: pkgsrc/textproc/py-ICU
Previous by Thread: CVS commit: pkgsrc/finance/hledger
Next by Thread: CVS commit: pkgsrc/textproc/py-ICU
Indexes:

Home | Main Index | Thread Index | Old Index