CVS commit: pkgsrc/lang/ghc7

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Feb 14 23:36:55 UTC 2020

Modified Files:
        pkgsrc/lang/ghc7: Makefile bootstrap.mk distinfo
Added Files:
        pkgsrc/lang/ghc7/patches: patch-configure

Log Message:
ghc7: Update SunOS bootstrap kit and fix a couple of issues.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/ghc7/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/ghc7/bootstrap.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/ghc7/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ghc7/patches/patch-configure

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

Modified files:

Index: pkgsrc/lang/ghc7/Makefile
diff -u pkgsrc/lang/ghc7/Makefile:1.40 pkgsrc/lang/ghc7/Makefile:1.41
--- pkgsrc/lang/ghc7/Makefile:1.40      Mon Jan 13 01:06:52 2020
+++ pkgsrc/lang/ghc7/Makefile   Fri Feb 14 23:36:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2020/01/13 01:06:52 pho Exp $
+# $NetBSD: Makefile,v 1.41 2020/02/14 23:36:54 jperkin Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -68,6 +68,7 @@ CONFIGURE_ARGS+=      ${CONFIGURE_ARGS.common
 
 CONFIGURE_ENV+= \
        ac_cv_path_fp_prog_ar=${AR:Q} \
+       ac_cv_path_READELF=readelf \
        PerlCmd=${PERL5:Q}
 
 # LDFLAGS is currently not honored by "./configure". Since LDFLAGS

Index: pkgsrc/lang/ghc7/bootstrap.mk
diff -u pkgsrc/lang/ghc7/bootstrap.mk:1.29 pkgsrc/lang/ghc7/bootstrap.mk:1.30
--- pkgsrc/lang/ghc7/bootstrap.mk:1.29  Mon Jan 13 01:06:52 2020
+++ pkgsrc/lang/ghc7/bootstrap.mk       Fri Feb 14 23:36:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.29 2020/01/13 01:06:52 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.30 2020/02/14 23:36:54 jperkin Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -43,9 +43,10 @@ DISTFILES:=  ${DISTFILES} ${BOOT_ARCHIVE}
 .endif
 
 .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-BOOT_VERSION:= 7.6.3
-BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-solaris2.tar.xz
-DISTFILES:=    ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
+BOOT_VERSION:=         7.6.3
+BOOT_ARCHIVE:=         ghc-${BOOT_VERSION}-boot-x86_64-unknown-solaris2.tar.xz
+SITES.${BOOT_ARCHIVE}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
+DISTFILES:=            ${DISTFILES} ${BOOT_ARCHIVE}
 .endif
 
 .if empty(BOOT_ARCHIVE)

Index: pkgsrc/lang/ghc7/distinfo
diff -u pkgsrc/lang/ghc7/distinfo:1.19 pkgsrc/lang/ghc7/distinfo:1.20
--- pkgsrc/lang/ghc7/distinfo:1.19      Mon Jan 13 01:06:52 2020
+++ pkgsrc/lang/ghc7/distinfo   Fri Feb 14 23:36:54 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2020/01/13 01:06:52 pho Exp $
+$NetBSD: distinfo,v 1.20 2020/02/14 23:36:54 jperkin Exp $
 
 SHA1 (ghc-7.10.3-boot-i386-unknown-freebsd.tar.xz) = 95a1c350f25677f0f9fefac66d99589aa6ce5fbe
 RMD160 (ghc-7.10.3-boot-i386-unknown-freebsd.tar.xz) = 0b27558c57a435c76478ea95a94d576a5579f48f
@@ -20,18 +20,19 @@ SHA1 (ghc-7.6.3-boot-powerpc-apple-darwi
 RMD160 (ghc-7.6.3-boot-powerpc-apple-darwin.tar.xz) = 7d4ab57dc6054cbd67b07e64b2142fded3121f09
 SHA512 (ghc-7.6.3-boot-powerpc-apple-darwin.tar.xz) = 5cb62b1571f197d85e6e0506c0fc4fa4d9d5f53405bfd0d8ba1df3bad857710ae818048aa6002df184139d73ab556e1226eb648394c7f9dbe170e540ea8a4cb6
 Size (ghc-7.6.3-boot-powerpc-apple-darwin.tar.xz) = 33660776 bytes
-SHA1 (ghc-7.6.3-boot-x86_64-unknown-solaris2.tar.xz) = 359b41cedf3b6194b7c0ca2241b37ea8db289cf6
-RMD160 (ghc-7.6.3-boot-x86_64-unknown-solaris2.tar.xz) = 5f26dd0beb7c884c445790aa47e7b62a30c52de7
-SHA512 (ghc-7.6.3-boot-x86_64-unknown-solaris2.tar.xz) = 8c4646942827cd38e15b9767967b687246d130dff2085a72ff4c193a58eb9fc15270dfd56c7f3368d3ca61c7c366bb6f701d01a60881d518d8649a39b43c08d9
-Size (ghc-7.6.3-boot-x86_64-unknown-solaris2.tar.xz) = 30357832 bytes
+SHA1 (ghc-7.6.3-boot-x86_64-unknown-solaris2.tar.xz) = 8ce3c5edc811c13f758ce13bb5491b93b820ecc6
+RMD160 (ghc-7.6.3-boot-x86_64-unknown-solaris2.tar.xz) = 88940a16df7735c95d077b5b147edc828c859294
+SHA512 (ghc-7.6.3-boot-x86_64-unknown-solaris2.tar.xz) = f253e82beaec3f0f06fdaf48d02d7ceabe43d54582992f0bac68e7be40dd9fbcafee4e84c15a470c3648a3aee16a0ad708a5a409d6c490e5687f9568109e5d46
+Size (ghc-7.6.3-boot-x86_64-unknown-solaris2.tar.xz) = 33541060 bytes
+SHA1 (patch-configure) = dafe8dee52e3e79e1ce9307fb62f283691bdb568
 SHA1 (patch-ghc.mk) = 542e3c8a2cd61eeeee6588ff62203c9c1074025d
-SHA1 (patch-libraries_base_configure.ac) = dd6132c5335d7e0421ec2181ebb5a34bb162e255
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
 SHA1 (patch-libraries_base_System_Environment.hs) = fd786a7aa2058b5d86d4646e3816fb53ea0bf59f
+SHA1 (patch-libraries_base_configure.ac) = dd6132c5335d7e0421ec2181ebb5a34bb162e255
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_CTimeval.hs) = 79f17fe77cc5469a90c811682a937c8d711d59c5
-SHA1 (patch-libraries_unix_include_execvpe.h) = a134be89b4bdd49eb5c5ed45756eb3a4ce5951a5
-SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 2ce83b35734244d49b037f8cac5eaa9d548f778c
 SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = 87bcd3b401fce656025777357a26a1ae514fd28d
+SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 2ce83b35734244d49b037f8cac5eaa9d548f778c
 SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = a80945863d7bd8f5f65af5371d3ab090071ea24e
 SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 6a2b9a527730ec593b70e827fdc1aaeccc575dad
+SHA1 (patch-libraries_unix_include_execvpe.h) = a134be89b4bdd49eb5c5ed45756eb3a4ce5951a5
 SHA1 (patch-rts_PosixSource.h) = 604608791f33245d9305dcbd6d9d5979fe162f21

Added files:

Index: pkgsrc/lang/ghc7/patches/patch-configure
diff -u /dev/null pkgsrc/lang/ghc7/patches/patch-configure:1.1
--- /dev/null   Fri Feb 14 23:36:55 2020
+++ pkgsrc/lang/ghc7/patches/patch-configure    Fri Feb 14 23:36:54 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2020/02/14 23:36:54 jperkin Exp $
+
+ld: fatal: symbol '__dtrace_HaskellEvent___task-create' is multiply-defined
+
+--- configure.orig     2015-11-30 23:39:05.000000000 +0000
++++ configure
+@@ -9125,7 +9125,7 @@ fi
+ 
+ 
+ if test -n "$DtraceCmd"; then
+-  if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple" -o "x$TargetOS_CPP-$TargetVendor_CPP" = "xsolaris2-unknown"; then
++  if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple"; then
+     HaveDtrace=YES
+   fi
+ fi