CVS commit: pkgsrc/lang/ghc80

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/ghc80
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Mon, 17 Feb 2020 17:22:43 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Feb 17 17:22:43 UTC 2020

Modified Files:
        pkgsrc/lang/ghc80: Makefile bootstrap.mk distinfo
        pkgsrc/lang/ghc80/patches: patch-configure.ac
Added Files:
        pkgsrc/lang/ghc80/patches: patch-rules_distdir-way-opts.mk

Log Message:
ghc80: Support SunOS/x86_64.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc80/Makefile \
    pkgsrc/lang/ghc80/bootstrap.mk pkgsrc/lang/ghc80/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ghc80/patches/patch-configure.ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc80/patches/patch-rules_distdir-way-opts.mk

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

Modified files:

Index: pkgsrc/lang/ghc80/Makefile
diff -u pkgsrc/lang/ghc80/Makefile:1.3 pkgsrc/lang/ghc80/Makefile:1.4
--- pkgsrc/lang/ghc80/Makefile:1.3      Tue Jan 14 08:46:17 2020
+++ pkgsrc/lang/ghc80/Makefile  Mon Feb 17 17:22:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/14 08:46:17 pho Exp $
+# $NetBSD: Makefile,v 1.4 2020/02/17 17:22:43 jperkin Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -26,8 +26,7 @@ CONFLICTS+=   ghc-[0-9]*
 BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-i386
 BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-x86_64
 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
+BROKEN_EXCEPT_ON_PLATFORM+= SunOS-*-x86_64
 
 
 # -----------------------------------------------------------------------------
Index: pkgsrc/lang/ghc80/bootstrap.mk
diff -u pkgsrc/lang/ghc80/bootstrap.mk:1.3 pkgsrc/lang/ghc80/bootstrap.mk:1.4
--- pkgsrc/lang/ghc80/bootstrap.mk:1.3  Tue Jan 14 08:46:17 2020
+++ pkgsrc/lang/ghc80/bootstrap.mk      Mon Feb 17 17:22:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.3 2020/01/14 08:46:17 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.4 2020/02/17 17:22:43 jperkin Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -42,16 +42,11 @@ BOOT_ARCHIVE:=      ghc-${BOOT_VERSION}-boot-
 DISTFILES:=    ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
 .endif
 
-.if !empty(MACHINE_PLATFORM:MSunOS-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-#BOOT_VERSION:=        7.10.3
-#BOOT_ARCHIVE:=        ghc-${BOOT_VERSION}-boot-i386-unknown-solaris2.tar.xz
-#DISTFILES:=   ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
-.endif
-
 .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-#BOOT_VERSION:=        7.10.3
-#BOOT_ARCHIVE:=        ghc-${BOOT_VERSION}-boot-x86_64-unknown-solaris2.tar.xz
-#DISTFILES:=   ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
+BOOT_VERSION:=         7.10.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)
@@ -101,7 +96,7 @@ pre-configure:
 # configured, otherwise it will produce executables with no rpath and
 # fail at the configure phase.
        @${PHASE_MSG} "Preparing bootstrapping compiler for ${PKGNAME}"
-       ${RUN}cd ${WRKDIR:Q}/build-extract/${PKGNAME_NOREV}-boot && \
+       ${RUN}cd ${WRKDIR:Q}/build-extract/ghc-${BOOT_VERSION}-boot && \
                ${PKGSRC_SETENV} ${CONFIGURE_ENV} ${SH} ./configure \
                        --prefix=${TOOLS_DIR:Q} && \
                ${MAKE_PROGRAM} install
Index: pkgsrc/lang/ghc80/distinfo
diff -u pkgsrc/lang/ghc80/distinfo:1.3 pkgsrc/lang/ghc80/distinfo:1.4
--- pkgsrc/lang/ghc80/distinfo:1.3      Tue Jan 14 08:46:17 2020
+++ pkgsrc/lang/ghc80/distinfo  Mon Feb 17 17:22:43 2020
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.3 2020/01/14 08:46:17 pho Exp $
+$NetBSD: distinfo,v 1.4 2020/02/17 17:22:43 jperkin Exp $
 
+SHA1 (ghc-7.10.3-boot-x86_64-unknown-solaris2.tar.xz) = 8ad1116768112bd6f2cf9a9ad2ed6b5052bedd4b
+RMD160 (ghc-7.10.3-boot-x86_64-unknown-solaris2.tar.xz) = c9ef4fa2f83b77b964a08b3f3b6d9916a490506f
+SHA512 (ghc-7.10.3-boot-x86_64-unknown-solaris2.tar.xz) = ba0bbfb1cc91fa9741bc3bec5e40a9bfb2c0a6a962674fcbc4e78dfb3c0ed5c267a6789a085f6a6bdeda5bb8ae0f1c995c21697b361427cb37ac860248a6cb9b
+Size (ghc-7.10.3-boot-x86_64-unknown-solaris2.tar.xz) = 55482280 bytes
 SHA1 (ghc-8.0.2-boot-i386-unknown-freebsd.tar.xz) = 0d6ffbb87f76aa4bfa243ba590978b993b359bd0
 RMD160 (ghc-8.0.2-boot-i386-unknown-freebsd.tar.xz) = cdcea446b5ae76ca90cac6fb3ae85c13fed04094
 SHA512 (ghc-8.0.2-boot-i386-unknown-freebsd.tar.xz) = 078290c325c8e5b8d861816750d58b4289ad51ac4f39b803b670d7ece5fb46e9fd39c1859ec54770ad9cfc7e423790d0f5a0c58e5881f96b4078763a6b48c0a0
@@ -17,15 +21,16 @@ RMD160 (ghc-8.0.2-src.tar.xz) = 56b74f65
 SHA512 (ghc-8.0.2-src.tar.xz) = 58ea3853cd93b556ecdc4abd0be079b2621171b8491f59004ea4e036a4cba4470aaafe6591b942e0a50a64bdc47540e01fe6900212a1ef7087850112d9bfc5ef
 Size (ghc-8.0.2-src.tar.xz) = 10687760 bytes
 SHA1 (patch-compiler_main_DynFlags.hs) = c9671ca255b06dfbb732f3c56e3cbe9bfed1c075
-SHA1 (patch-configure.ac) = 49ee5bb2e1fdb8bd1cb355f2a499d056801964d2
+SHA1 (patch-configure.ac) = 2323f76a41f1dd65054f4d408629d7b1840b89a4
 SHA1 (patch-iserv_ghc.mk) = 6d1d79100b4a7b5d8b0c6f25318eaa8b4e20e43d
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
 SHA1 (patch-libraries_base_System_Environment.hs) = ec3dfd916593f600a397e5b594672e6d3564f042
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_CTimespec.hsc) = 758502590ac746990ffcc7fd08dda441ca003532
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_CTimeval.hs) = 8961cbf704b29c5e06ec6a95b9a9c9d0db69760a
-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_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a
 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_PosixSource.h) = 604608791f33245d9305dcbd6d9d5979fe162f21
+SHA1 (patch-rules_distdir-way-opts.mk) = 58d9d209762b27da60da98eb942b284b70c88fc5

Index: pkgsrc/lang/ghc80/patches/patch-configure.ac
diff -u pkgsrc/lang/ghc80/patches/patch-configure.ac:1.1 pkgsrc/lang/ghc80/patches/patch-configure.ac:1.2
--- pkgsrc/lang/ghc80/patches/patch-configure.ac:1.1    Tue Jan 14 08:46:17 2020
+++ pkgsrc/lang/ghc80/patches/patch-configure.ac        Mon Feb 17 17:22:43 2020
@@ -1,10 +1,19 @@
-$NetBSD: patch-configure.ac,v 1.1 2020/01/14 08:46:17 pho Exp $
+$NetBSD: patch-configure.ac,v 1.2 2020/02/17 17:22:43 jperkin Exp $
 
 Fix build on FreeBSD/amd64.
 
 --- configure.ac.orig  2017-01-04 14:17:17.000000000 +0000
 +++ configure.ac
-@@ -1060,6 +1060,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; then
+@@ -732,7 +732,7 @@ dnl ** check for dtrace (currently only
+ HaveDtrace=NO
+ AC_PATH_PROG(DtraceCmd,dtrace)
+ 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
+@@ -1060,6 +1060,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; t
            # The flag MAP_NORESERVE is supported for source compatibility reasons,
            # but is completely ignored by OS mmap
              use_large_address_space=no

Added files:

Index: pkgsrc/lang/ghc80/patches/patch-rules_distdir-way-opts.mk
diff -u /dev/null pkgsrc/lang/ghc80/patches/patch-rules_distdir-way-opts.mk:1.1
--- /dev/null   Mon Feb 17 17:22:43 2020
+++ pkgsrc/lang/ghc80/patches/patch-rules_distdir-way-opts.mk   Mon Feb 17 17:22:43 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-rules_distdir-way-opts.mk,v 1.1 2020/02/17 17:22:43 jperkin Exp $
+
+https://gitlab.haskell.org/ghc/ghc/issues/17385
+
+--- rules/distdir-way-opts.mk.orig     2017-01-04 04:04:11.000000000 +0000
++++ rules/distdir-way-opts.mk
+@@ -196,8 +196,8 @@ $1_$2_$3_ALL_LD_OPTS = \
+  $$($1_$2_$3_LD_OPTS) \
+  $$($1_$2_EXTRA_LD_OPTS) \
+  $$(EXTRA_LD_OPTS) \
+- $$(foreach o,$$(EXTRA_LD_LINKER_OPTS),-optl-Wl$$(comma)$$o) \
+- $$(foreach o,$$(CONF_LD_LINKER_OPTS_STAGE$4),-optl-Wl$$(comma)$$o)
++ $$(foreach o,$$(EXTRA_LD_LINKER_OPTS),-Wl$$(comma)$$o) \
++ $$(foreach o,$$(CONF_LD_LINKER_OPTS_STAGE$4),-Wl$$(comma)$$o)
+ 
+ # Options for passing to GHC when we use it for linking
+ $1_$2_$3_GHC_LD_OPTS = \

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/lang/ghc84
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/lang/ghc84
Indexes:

Home | Main Index | Thread Index | Old Index