cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update lang/ghc to 8.10.6

Browse Source 
A couple of patches are obsolete now.

OK kili
This commit is contained in:
gnezdo 2021-08-16 21:23:18 +00:00
parent 093453e52e
commit 4ca4ee0f79
5 changed files with 17 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lang/ghc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.187 2021/07/06 16:55:33 daniel Exp $
# $OpenBSD: Makefile,v 1.188 2021/08/16 21:23:18 gnezdo Exp $
# Not yet ported to other architectures
ONLY_FOR_ARCHS = i386 amd64
@ -14,11 +14,10 @@ COMMENT = compiler for the functional language Haskell
# ghc hardcodes ${WRKDIR}/bin/gcc when the package is compiled with ccache
NO_CCACHE = Yes
GHC_VERSION = 8.10.5
GHC_VERSION = 8.10.6
DISTNAME = ghc-${GHC_VERSION}
CATEGORIES = lang devel
HOMEPAGE = https://www.haskell.org/ghc/
REVISION = 0
# Version of the precompiled binaries
BIN_VER = 8.10.3.20210429
@ -73,24 +72,24 @@ SUPDISTFILES += ${BINDISTFILE-$m}
GHC_ITEMS = \
CABAL 3.2.1.0 \
ARRAY 0.5.4.0 \
BASE 4.14.2.0 \
BASE 4.14.3.0 \
BINARY 0.8.8.0 \
BYTESTRING 0.10.12.0 \
CONTAINERS 0.6.4.1 \
CONTAINERS 0.6.5.1 \
DEEPSEQ 1.4.4.0 \
DIRECTORY 1.3.6.0 \
EXCEPTIONS 0.10.4 \
FILEPATH 1.4.2.1 \
GHC 8.10.5 \
GHC 8.10.6 \
GHC_COMPACT 0.1.0.0 \
GHC_PRIM 0.6.1 \
HASKELINE 0.8.0.1 \
HASKELINE 0.8.2 \
HPC 0.6.1.0 \
INTEGER_GMP 1.0.3.0 \
MTL 2.2.2 \
PARSEC 3.1.14.0 \
PRETTY 1.1.3.6 \
PROCESS 1.6.9.0 \
PROCESS 1.6.13.2 \
STM 2.5.0.1 \
TEMPLATE-HASKELL 2.16.0.0 \
TERMINFO 0.4.1.4 \
@ -108,7 +107,7 @@ SUBST_VARS += ${_i}_VER
USE_GMAKE = Yes
USE_GROFF = Yes
AUTOCONF_VERSION = 2.69
AUTOCONF_VERSION = 2.71
CONFIGURE_STYLE = gnu autoconf no-autoheader
CONFIGURE_ARGS += --with-ffi-includes=${LOCALBASE}/include \
--with-ffi-libraries=${LOCALBASE}/lib \

8
lang/ghc/distinfo
View File

@ -2,11 +2,11 @@ SHA256 (ghc/ghc-8.10.3.20210429-amd64-unknown-openbsd.tar.xz) = GR5pHBh8PWUn12UK
SHA256 (ghc/ghc-8.10.3.20210429-i386-unknown-openbsd.tar.xz) = T1OMZYN2sr+E88g88qElX6RYZbPdqANXGhWgCfKdFiY=
SHA256 (ghc/ghc-8.10.3.20210429-shlibs-amd64.tar.gz) = M+B6p7cC4v3f1BrArX1DW6sie+HX3itEW5cTftI9yZE=
SHA256 (ghc/ghc-8.10.3.20210429-shlibs-i386.tar.gz) = A/paDCY65gLRxas7/mNGUg0W7lR9XWJcJmnAJkcf5C4=
SHA256 (ghc/ghc-8.10.5-src.tar.xz) = 8QlB8W5PvZhYCrUkG5JxuwhRMEVgxNXKEn47DiDjB28=
SHA256 (ghc/ghc-8.10.5-testsuite.tar.xz) = ppkkqER2FLzgE3WJZm5EX2FxO2XlHmj1Rtgsl8k5mG0=
SHA256 (ghc/ghc-8.10.6-src.tar.xz) = Q6+6cqUzQItCwUkr0Ee1435fcgTkGlzt0xgsyEFhDOk=
SHA256 (ghc/ghc-8.10.6-testsuite.tar.xz) = 6yX1PAvNC/Sae0ndofh95GH9kzs/a1FitvidSE298rk=
SIZE (ghc/ghc-8.10.3.20210429-amd64-unknown-openbsd.tar.xz) = 48779544
SIZE (ghc/ghc-8.10.3.20210429-i386-unknown-openbsd.tar.xz) = 49505820
SIZE (ghc/ghc-8.10.3.20210429-shlibs-amd64.tar.gz) = 2910620
SIZE (ghc/ghc-8.10.3.20210429-shlibs-i386.tar.gz) = 2759631
SIZE (ghc/ghc-8.10.5-src.tar.xz) = 19920148
SIZE (ghc/ghc-8.10.5-testsuite.tar.xz) = 2270504
SIZE (ghc/ghc-8.10.6-src.tar.xz) = 19932832
SIZE (ghc/ghc-8.10.6-testsuite.tar.xz) = 2265044

17
lang/ghc/patches/patch-docs_users_guide_conf_py
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-docs_users_guide_conf_py,v 1.1 2021/07/06 16:55:33 daniel Exp $
sphinx 4.0.2 build-time fix; part of upstream commit
83407ffc
Index: docs/users_guide/conf.py
--- docs/users_guide/conf.py.orig
+++ docs/users_guide/conf.py
@@ -100,7 +100,7 @@ htmlhelp_basename = 'GHCUsersGuide'
latex_elements = {
'inputenc': '',
'utf8extra': '',
- 'preamble': '''
+ 'preamble': r'''
\usepackage{fontspec}
\usepackage{makeidx}
\setsansfont{DejaVu Sans}

26
lang/ghc/patches/patch-libraries_process_include_runProcess_h
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-libraries_process_include_runProcess_h,v 1.5 2021/03/10 01:33:40 gnezdo Exp $
vfork is for terrorists
Index: libraries/process/include/runProcess.h
--- libraries/process/include/runProcess.h.orig
+++ libraries/process/include/runProcess.h
@@ -30,18 +30,7 @@
#include <fcntl.h>
#endif
-#ifdef HAVE_VFORK_H
-#include <vfork.h>
-#endif
-
-#if defined(HAVE_WORKING_VFORK)
-#define myfork vfork
-#elif defined(HAVE_WORKING_FORK)
#define myfork fork
-// We don't need a fork command on Windows
-#elif !(defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32))
-#error Cannot find a working fork command
-#endif
#ifdef HAVE_SIGNAL_H
#include <signal.h>

8
lang/ghc/pkg/PFRAG.no_i386
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.no_i386,v 1.3 2021/07/06 16:55:33 daniel Exp $
@comment $OpenBSD: PFRAG.no_i386,v 1.4 2021/08/16 21:23:18 gnezdo Exp $
bin/haddock
bin/haddock-ghc-${GHC_VER}
@bin lib/ghc/bin/haddock
@ -2368,14 +2368,16 @@ share/doc/ghc/html/users_guide/8.10.1-notes.html
share/doc/ghc/html/users_guide/8.10.2-notes.html
share/doc/ghc/html/users_guide/8.10.3-notes.html
share/doc/ghc/html/users_guide/8.10.4-notes.html
share/doc/ghc/html/users_guide/_sources/8.10.3-notes.rst.txt
share/doc/ghc/html/users_guide/_sources/8.10.4-notes.rst.txt
share/doc/ghc/html/users_guide/8.10.5-notes.html
share/doc/ghc/html/users_guide/${GHC_VER}-notes.html
share/doc/ghc/html/users_guide/_images/
share/doc/ghc/html/users_guide/_images/prof_scc.svg
share/doc/ghc/html/users_guide/_sources/
share/doc/ghc/html/users_guide/_sources/8.10.1-notes.rst.txt
share/doc/ghc/html/users_guide/_sources/8.10.2-notes.rst.txt
share/doc/ghc/html/users_guide/_sources/8.10.3-notes.rst.txt
share/doc/ghc/html/users_guide/_sources/8.10.4-notes.rst.txt
share/doc/ghc/html/users_guide/_sources/8.10.5-notes.rst.txt
share/doc/ghc/html/users_guide/_sources/${GHC_VER}-notes.rst.txt
share/doc/ghc/html/users_guide/_sources/bugs.rst.txt
share/doc/ghc/html/users_guide/_sources/codegens.rst.txt