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

Update lang/ghc to 8.10.5

Browse Source 
The change in cabal-install has to be synchronized due to some
internal version numbers embedded into the JSON file.

ok kili@
This commit is contained in:
gnezdo 2021-06-09 04:22:19 +00:00
parent 8100ff1492
commit dd66bc059c
11 changed files with 56 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/cabal-install/files/openbsd-8.10.3.json
View File

File diff suppressed because one or more lines are too long

13
lang/ghc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.185 2021/05/02 21:45:24 gnezdo Exp $
# $OpenBSD: Makefile,v 1.186 2021/06/09 04:22:19 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.3
GHC_VERSION = 8.10.5
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,15 +72,15 @@ SUPDISTFILES += ${BINDISTFILE-$m}
GHC_ITEMS = \
CABAL 3.2.1.0 \
ARRAY 0.5.4.0 \
BASE 4.14.1.0 \
BASE 4.14.2.0 \
BINARY 0.8.8.0 \
BYTESTRING 0.10.12.0 \
CONTAINERS 0.6.2.1 \
CONTAINERS 0.6.4.1 \
DEEPSEQ 1.4.4.0 \
DIRECTORY 1.3.6.0 \
EXCEPTIONS 0.10.4 \
FILEPATH 1.4.2.1 \
GHC 8.10.3 \
GHC 8.10.5 \
GHC_COMPACT 0.1.0.0 \
GHC_PRIM 0.6.1 \
HASKELINE 0.8.0.1 \
@ -91,7 +90,7 @@ GHC_ITEMS = \
PARSEC 3.1.14.0 \
PRETTY 1.1.3.6 \
PROCESS 1.6.9.0 \
STM 2.5.0.0 \
STM 2.5.0.1 \
TEMPLATE-HASKELL 2.16.0.0 \
TERMINFO 0.4.1.4 \
TEXT 1.2.4.1 \

8
lang/ghc/distinfo
View File

@ -1,12 +1,12 @@
SHA256 (ghc/ghc-8.10.3-src.tar.xz) = zNyDGVSQKKcI1xY+KWc4JnexpaN5/5TZSBlbXPRuuTE=
SHA256 (ghc/ghc-8.10.3-testsuite.tar.xz) = j4LmkGf+aaH9CRYyXYx2yQsFA5Ppw3pwJ01g+bNM/gA=
SHA256 (ghc/ghc-8.10.3.20210429-amd64-unknown-openbsd.tar.xz) = GR5pHBh8PWUn12UK+XZ6ikB2+xWxkdqAsYaEBsiR0Zo=
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=
SIZE (ghc/ghc-8.10.3-src.tar.xz) = 19872356
SIZE (ghc/ghc-8.10.3-testsuite.tar.xz) = 2261376
SHA256 (ghc/ghc-8.10.5-src.tar.xz) = 8QlB8W5PvZhYCrUkG5JxuwhRMEVgxNXKEn47DiDjB28=
SHA256 (ghc/ghc-8.10.5-testsuite.tar.xz) = ppkkqER2FLzgE3WJZm5EX2FxO2XlHmj1Rtgsl8k5mG0=
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

4
lang/ghc/patches/patch-aclocal_m4
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-aclocal_m4,v 1.4 2021/03/10 01:33:40 gnezdo Exp $
$OpenBSD: patch-aclocal_m4,v 1.5 2021/06/09 04:22:20 gnezdo Exp $
Index: aclocal.m4
--- aclocal.m4.orig
+++ aclocal.m4
@@ -732,6 +732,12 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
@@ -767,6 +767,12 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
$4="$$4 -z wxneeded"
;;

4
lang/ghc/patches/patch-configure
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-configure,v 1.21 2021/03/10 01:33:40 gnezdo Exp $
$OpenBSD: patch-configure,v 1.22 2021/06/09 04:22:20 gnezdo Exp $
Index: configure
--- configure.orig
+++ configure
@@ -9343,7 +9343,7 @@ else
@@ -9979,7 +9979,7 @@ else $as_nop
if test "$Unregisterised" = "YES"; then
# These used to be conditioned on gcc version but we no longer support
# GCC versions which lack support for these flags

4
lang/ghc/patches/patch-ghc_mk
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-ghc_mk,v 1.15 2021/03/10 01:33:40 gnezdo Exp $
$OpenBSD: patch-ghc_mk,v 1.16 2021/06/09 04:22:20 gnezdo Exp $
Fix the bindist-list (for building the bootstrapper); without this,
gtar creates an archive which our tar can't extract.
@ -6,7 +6,7 @@ gtar creates an archive which our tar can't extract.
Index: ghc.mk
--- ghc.mk.orig
+++ ghc.mk
@@ -1086,6 +1086,8 @@ unix-binary-dist-prep: $(includes_1_H_CONFIG) $(includ
@@ -1098,6 +1098,8 @@ unix-binary-dist-prep: $(includes_1_H_CONFIG) $(includ
echo "CrossCompiling = $(CrossCompiling)" >> $(BIN_DIST_MK)
cd $(BIN_DIST_PREP_DIR) && autoreconf
$(call removeFiles,$(BIN_DIST_PREP_TAR))

17
lang/ghc/patches/patch-libraries_base_configure Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-libraries_base_configure,v 1.1 2021/06/09 04:22:20 gnezdo Exp $
Unbreaks iconv check as explained in:
https://gitlab.haskell.org/ghc/ghc/-/commit/544414ba604b13e0992ad87e90b8bdf45c43011c#3bae3b74ae866493bd6b79df16cb638a5f2e0f87_106_106
Index: libraries/base/configure
--- libraries/base/configure.orig
+++ libraries/base/configure
@@ -4934,7 +4934,7 @@ esac
# Check whether --with-iconv-includes was given.
if test ${with_iconv_includes+y}
then :
- withval=$with_iconv_includes; ICONV_INCLUDE_DIRS=$withval
+ withval=$with_iconv_includes; ICONV_INCLUDE_DIRS=$withval; CPPFLAGS="-I$withval $CPPFLAGS"
else $as_nop
ICONV_INCLUDE_DIRS=
fi

30
lang/ghc/patches/patch-rts_Linker_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-rts_Linker_c,v 1.14 2021/03/10 01:33:40 gnezdo Exp $
Undo extreme slowdown:
https://github.com/blackgnezdo/ports/issues/14
Index: rts/Linker.c
--- rts/Linker.c.orig
+++ rts/Linker.c
@@ -1027,20 +1027,7 @@ resolveSymbolAddr (pathchar* buffer, int size,
void*
mmap_next(void *addr, size_t length, int prot, int flags, int fd, off_t offset) {
- if(addr == NULL) return mmap(addr, length, prot, flags, fd, offset);
- // we are going to look for up to pageSize * 1024 * 1024 (4GB) from the
- // address.
- size_t pageSize = getPageSize();
- for(int i = (uintptr_t)addr & (pageSize-1) ? 1 : 0; i < 1024*1024; i++) {
- void *target = (void*)(((uintptr_t)addr & ~(pageSize-1))+(i*pageSize));
- void *mem = mmap(target, length, prot, flags, fd, offset);
- if(mem == NULL) return mem;
- if(mem == target) return mem;
- munmap(mem, length);
- IF_DEBUG(linker && (i % 1024 == 0),
- debugBelch("mmap_next failed to find suitable space in %p - %p\n", addr, target));
- }
- return NULL;
+ return mmap(addr, length, prot, flags, fd, offset);
}
//

8
lang/ghc/patches/patch-testsuite_driver_testlib_py
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-testsuite_driver_testlib_py,v 1.11 2021/03/10 01:33:40 gnezdo Exp $
$OpenBSD: patch-testsuite_driver_testlib_py,v 1.12 2021/06/09 04:22:20 gnezdo Exp $
Index: testsuite/driver/testlib.py
--- testsuite/driver/testlib.py.orig
+++ testsuite/driver/testlib.py
@@ -1909,6 +1909,13 @@ def compare_outputs(way: WayName,
@@ -1925,6 +1925,13 @@ def compare_outputs(way: WayName,
actual_raw = read_no_crs(actual_path)
actual_str = normaliser(actual_raw)
@ -16,7 +16,7 @@ Index: testsuite/driver/testlib.py
# See Note [Output comparison].
if whitespace_normaliser(expected_str) == whitespace_normaliser(actual_str):
return True
@@ -1925,7 +1932,7 @@ def compare_outputs(way: WayName,
@@ -1941,7 +1948,7 @@ def compare_outputs(way: WayName,
if config.verbose >= 1 and _expect_pass(way):
# See Note [Output comparison].
@ -25,7 +25,7 @@ Index: testsuite/driver/testlib.py
actual_normalised_path),
stdout=diff_file,
print_output=True)
@@ -1933,7 +1940,7 @@ def compare_outputs(way: WayName,
@@ -1949,7 +1956,7 @@ def compare_outputs(way: WayName,
# If for some reason there were no non-whitespace differences,
# then do a full diff
if r == 0:

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.no_i386,v 1.1 2021/03/10 01:33:40 gnezdo Exp $
@comment $OpenBSD: PFRAG.no_i386,v 1.2 2021/06/09 04:22:20 gnezdo Exp $
bin/haddock
bin/haddock-ghc-${GHC_VER}
@bin lib/ghc/bin/haddock
@ -101,12 +101,16 @@ share/doc/ghc/html/haddock/_static/alabaster.css
share/doc/ghc/html/haddock/_static/basic.css
share/doc/ghc/html/haddock/_static/custom.css
share/doc/ghc/html/haddock/_static/doctools.js
share/doc/ghc/html/haddock/_static/documentation_options.js
share/doc/ghc/html/haddock/_static/file.png
share/doc/ghc/html/haddock/_static/jquery-3.5.1.js
share/doc/ghc/html/haddock/_static/jquery.js
share/doc/ghc/html/haddock/_static/language_data.js
share/doc/ghc/html/haddock/_static/minus.png
share/doc/ghc/html/haddock/_static/plus.png
share/doc/ghc/html/haddock/_static/pygments.css
share/doc/ghc/html/haddock/_static/searchtools.js
share/doc/ghc/html/haddock/_static/underscore-1.12.0.js
share/doc/ghc/html/haddock/_static/underscore.js
share/doc/ghc/html/haddock/genindex.html
share/doc/ghc/html/haddock/index.html
@ -1135,8 +1139,8 @@ share/doc/ghc/html/libraries/ghc-${GHC_VER}/GHC-HsToCore-PmCheck-Oracle.html
share/doc/ghc/html/libraries/ghc-${GHC_VER}/GHC-HsToCore-PmCheck-Ppr.html
share/doc/ghc/html/libraries/ghc-${GHC_VER}/GHC-HsToCore-PmCheck-Types.html
share/doc/ghc/html/libraries/ghc-${GHC_VER}/GHC-HsToCore-PmCheck.html
share/doc/ghc/html/libraries/ghc-${GHC_VER}/GHC-Platform-AArch64.html
share/doc/ghc/html/libraries/ghc-${GHC_VER}/GHC-Platform-ARM.html
share/doc/ghc/html/libraries/ghc-${GHC_VER}/GHC-Platform-ARM64.html
share/doc/ghc/html/libraries/ghc-${GHC_VER}/GHC-Platform-NoRegs.html
share/doc/ghc/html/libraries/ghc-${GHC_VER}/GHC-Platform-PPC.html
share/doc/ghc/html/libraries/ghc-${GHC_VER}/GHC-Platform-Regs.html
@ -2362,6 +2366,10 @@ share/doc/ghc/html/users_guide/
share/doc/ghc/html/users_guide/.buildinfo
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/${GHC_VER}-notes.html
share/doc/ghc/html/users_guide/_images/
share/doc/ghc/html/users_guide/_images/prof_scc.svg
@ -2408,9 +2416,12 @@ share/doc/ghc/html/users_guide/_static/
share/doc/ghc/html/users_guide/_static/Recip.png
share/doc/ghc/html/users_guide/_static/basic.css
share/doc/ghc/html/users_guide/_static/doctools.js
share/doc/ghc/html/users_guide/_static/documentation_options.js
share/doc/ghc/html/users_guide/_static/file.png
share/doc/ghc/html/users_guide/_static/ghc-theme.css
share/doc/ghc/html/users_guide/_static/jquery-3.5.1.js
share/doc/ghc/html/users_guide/_static/jquery.js
share/doc/ghc/html/users_guide/_static/language_data.js
share/doc/ghc/html/users_guide/_static/logo.pdf
share/doc/ghc/html/users_guide/_static/minus.png
share/doc/ghc/html/users_guide/_static/opensearch.xml
@ -2419,6 +2430,7 @@ share/doc/ghc/html/users_guide/_static/prof_scc.pdf
share/doc/ghc/html/users_guide/_static/prof_scc.svg
share/doc/ghc/html/users_guide/_static/pygments.css
share/doc/ghc/html/users_guide/_static/searchtools.js
share/doc/ghc/html/users_guide/_static/underscore-1.12.0.js
share/doc/ghc/html/users_guide/_static/underscore.js
share/doc/ghc/html/users_guide/bugs.html
share/doc/ghc/html/users_guide/codegens.html
@ -2460,11 +2472,3 @@ share/doc/ghc/html/users_guide/using.html
share/doc/ghc/html/users_guide/utils.html
share/doc/ghc/html/users_guide/what_glasgow_exts_does.html
share/doc/ghc/html/users_guide/win32-dlls.html
share/doc/ghc/html/haddock/_static/documentation_options.js
share/doc/ghc/html/haddock/_static/jquery-3.5.1.js
share/doc/ghc/html/haddock/_static/language_data.js
share/doc/ghc/html/haddock/_static/underscore-1.12.0.js
share/doc/ghc/html/users_guide/_static/documentation_options.js
share/doc/ghc/html/users_guide/_static/jquery-3.5.1.js
share/doc/ghc/html/users_guide/_static/language_data.js
share/doc/ghc/html/users_guide/_static/underscore-1.12.0.js

8
lang/ghc/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2021/03/10 01:33:40 gnezdo Exp $
@comment $OpenBSD: PLIST,v 1.19 2021/06/09 04:22:20 gnezdo Exp $
@conflict hs-xhtml-*
@conflict hs-deepseq-<=1.1.0.2p0
@conflict hs-binary-*
@ -2475,12 +2475,12 @@ lib/ghc/ghc-${GHC_VER}/GHC/HsToCore/PmCheck/Types.dyn_hi
lib/ghc/ghc-${GHC_VER}/GHC/HsToCore/PmCheck/Types.hi
lib/ghc/ghc-${GHC_VER}/GHC/HsToCore/PmCheck/Types.p_hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/
lib/ghc/ghc-${GHC_VER}/GHC/Platform/AArch64.dyn_hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/AArch64.hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/AArch64.p_hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/ARM.dyn_hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/ARM.hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/ARM.p_hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/ARM64.dyn_hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/ARM64.hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/ARM64.p_hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/NoRegs.dyn_hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/NoRegs.hi
lib/ghc/ghc-${GHC_VER}/GHC/Platform/NoRegs.p_hi