diff --git a/devel/cabal-install/files/openbsd-8.10.3.json b/devel/cabal-install/files/openbsd-8.10.3.json index 2975d7fbaf0..3794e2feb74 100644 --- a/devel/cabal-install/files/openbsd-8.10.3.json +++ b/devel/cabal-install/files/openbsd-8.10.3.json @@ -1 +1 @@ -{"builtin":[{"version":"1.0","package":"rts"},{"version":"0.6.1","package":"ghc-prim"},{"version":"1.0.3.0","package":"integer-gmp"},{"version":"4.14.1.0","package":"base"},{"version":"0.5.4.0","package":"array"},{"version":"1.4.4.0","package":"deepseq"},{"version":"0.10.12.0","package":"bytestring"},{"version":"0.6.2.1","package":"containers"},{"version":"0.8.8.0","package":"binary"},{"version":"1.4.2.1","package":"filepath"},{"version":"1.9.3","package":"time"},{"version":"2.7.2.2","package":"unix"},{"version":"1.3.6.0","package":"directory"},{"version":"0.5.6.2","package":"transformers"},{"version":"2.2.2","package":"mtl"},{"version":"8.10.3","package":"ghc-boot-th"},{"version":"1.1.3.6","package":"pretty"},{"version":"2.16.0.0","package":"template-haskell"},{"version":"1.2.4.1","package":"text"},{"version":"3.1.14.0","package":"parsec"},{"version":"1.6.9.0","package":"process"},{"version":"2.5.0.0","package":"stm"}],"dependencies":[{"flags":["-bundled-binary-generic"],"src_sha256":null,"version":"3.4.0.0","package":"Cabal","source":"local","revision":null,"cabal_sha256":null},{"flags":["-examples","+integer-gmp","+sse2","-sse41"],"src_sha256":"822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4","version":"1.3.0.0","package":"hashable","source":"hackage","revision":2,"cabal_sha256":"d60cad00223d46172020c136e68acef0481a47d0302b2e74b1805b4f3a446a9b"},{"flags":["-bench"],"src_sha256":"4b4ab1ac82c45144d82c6daf6cb6ba45eab9957dad44787fa5e869e23d73bbff","version":"2.2.2","package":"async","source":"hackage","revision":1,"cabal_sha256":"a178c166856da7ff22fe4500337b54812e94fd2059409452187d72e057ede9cd"},{"flags":["-optimised-mixer"],"src_sha256":"46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35","version":"0.1.0.3","package":"splitmix","source":"hackage","revision":0,"cabal_sha256":"fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c"},{"flags":[],"src_sha256":"e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de","version":"1.2.0","package":"random","source":"hackage","revision":3,"cabal_sha256":"1e8140229d21489228aa79b820c23259f3c3a1b86e13e6f9c2ad0c48d86d1912"},{"flags":["-old-bytestring","-old-time"],"src_sha256":"b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de","version":"0.5.1.1","package":"tar","source":"hackage","revision":2,"cabal_sha256":"7a715414c4d494c9048cfb6d7634e07e7732ca154cb8938dc85f6ea192192e8c"},{"flags":["-devel"],"src_sha256":"fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a","version":"3.1.2.1","package":"network","source":"hackage","revision":1,"cabal_sha256":"188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b"},{"flags":[],"src_sha256":"a01c1389f15d2cc2e847914737f706133bb11f0c5f8ee89711a36a25b7afa723","version":"2.6.3.0","package":"network-uri","source":"hackage","revision":0,"cabal_sha256":"d2d9ff3a80d9b2d1ff317a354bc0c56cc109c69a4c2449e5fc712d3ddce83ede"},{"flags":["-conduit10","-mtl1","+network-uri","-warn-as-error","-warp-tests"],"src_sha256":"0d6b368e43001c046660e0e209bf9795dc990cb45016447fcf92e822c22e1594","version":"4000.3.15","package":"HTTP","source":"hackage","revision":2,"cabal_sha256":"2ba9cfc40afbb231326c4ff685ae678c4454e449fd41672e5ca75fd757fe6ae6"},{"flags":[],"src_sha256":"525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba","version":"0.1.1.7","package":"base16-bytestring","source":"hackage","revision":3,"cabal_sha256":"0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3"},{"flags":[],"src_sha256":"af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638","version":"1.2.0.1","package":"base64-bytestring","source":"hackage","revision":0,"cabal_sha256":"f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac"},{"flags":["-exe"],"src_sha256":"52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd","version":"0.11.101.0","package":"cryptohash-sha256","source":"hackage","revision":4,"cabal_sha256":"b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602"},{"flags":["-example"],"src_sha256":"704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef","version":"0.1.3","package":"echo","source":"hackage","revision":1,"cabal_sha256":"5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f"},{"flags":[],"src_sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","version":"0.2.2.1","package":"edit-distance","source":"hackage","revision":1,"cabal_sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee"},{"flags":["+no-donna","+test-doctests","+test-hlint","+test-properties"],"src_sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","version":"0.0.5.0","package":"ed25519","source":"hackage","revision":3,"cabal_sha256":"fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa"},{"flags":["+ofd-locking"],"src_sha256":"8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2","version":"0.1.1.2","package":"lukko","source":"hackage","revision":0,"cabal_sha256":"c9d3fa30fb6ab2ba16e037586ca79be6e57ec5f00381b6ee5f293400dbdf5515"},{"flags":["-bundled-c-zlib","-non-blocking-ffi","-pkg-config"],"src_sha256":"04b5890dd69e992f8cd09570d81e9d5ecab19db8e82cbe47ba8e02c31c0631ba","version":"0.6.2.2","package":"zlib","source":"hackage","revision":0,"cabal_sha256":"eae95cb0cc80ff259de236b812072c4a74c6de398cb277ff0fba1148edc0253d"},{"flags":["+base48","+lukko","-mtl21","-old-directory","+use-network-uri"],"src_sha256":"9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17","version":"0.6.0.1","package":"hackage-security","source":"hackage","revision":4,"cabal_sha256":"25e49fa21996bb3db92e2a978fc01586e6f4053fe86a5069d7312b7c2beea419"},{"flags":[],"src_sha256":"c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914","version":"0.94.0.0","package":"regex-base","source":"hackage","revision":1,"cabal_sha256":"44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e"},{"flags":["-_regex-posix-clib"],"src_sha256":"251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521","version":"0.96.0.0","package":"regex-posix","source":"hackage","revision":1,"cabal_sha256":"690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3"},{"flags":[],"src_sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","version":"0.1.2.0","package":"resolv","source":"hackage","revision":0,"cabal_sha256":"0a9a6dd29706258ae60a5c22aecc140a40743b8f08fc324fd9984e7dfbf3a80d"},{"flags":["-debug-conflict-sets","-debug-expensive-assertions","-debug-tracetree","+lukko","+native-dns"],"src_sha256":null,"version":"3.4.0.0","package":"cabal-install","source":"local","revision":null,"cabal_sha256":null}]} \ No newline at end of file +{"builtin":[{"version":"1.0.1","package":"rts"},{"version":"0.6.1","package":"ghc-prim"},{"version":"1.0.3.0","package":"integer-gmp"},{"version":"4.14.2.0","package":"base"},{"version":"0.5.4.0","package":"array"},{"version":"1.4.4.0","package":"deepseq"},{"version":"0.10.12.0","package":"bytestring"},{"version":"0.6.4.1","package":"containers"},{"version":"0.8.8.0","package":"binary"},{"version":"1.4.2.1","package":"filepath"},{"version":"1.9.3","package":"time"},{"version":"2.7.2.2","package":"unix"},{"version":"1.3.6.0","package":"directory"},{"version":"0.5.6.2","package":"transformers"},{"version":"2.2.2","package":"mtl"},{"version":"8.10.5","package":"ghc-boot-th"},{"version":"1.1.3.6","package":"pretty"},{"version":"2.16.0.0","package":"template-haskell"},{"version":"1.2.4.1","package":"text"},{"version":"3.1.14.0","package":"parsec"},{"version":"1.6.9.0","package":"process"},{"version":"2.5.0.1","package":"stm"}],"dependencies":[{"flags":["-bundled-binary-generic"],"src_sha256":null,"version":"3.4.0.0","package":"Cabal","source":"local","revision":null,"cabal_sha256":null},{"flags":["-examples","+integer-gmp","+sse2","-sse41"],"src_sha256":"822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4","version":"1.3.0.0","package":"hashable","source":"hackage","revision":2,"cabal_sha256":"d60cad00223d46172020c136e68acef0481a47d0302b2e74b1805b4f3a446a9b"},{"flags":["-bench"],"src_sha256":"4b4ab1ac82c45144d82c6daf6cb6ba45eab9957dad44787fa5e869e23d73bbff","version":"2.2.2","package":"async","source":"hackage","revision":1,"cabal_sha256":"a178c166856da7ff22fe4500337b54812e94fd2059409452187d72e057ede9cd"},{"flags":["-optimised-mixer"],"src_sha256":"46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35","version":"0.1.0.3","package":"splitmix","source":"hackage","revision":0,"cabal_sha256":"fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c"},{"flags":[],"src_sha256":"e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de","version":"1.2.0","package":"random","source":"hackage","revision":3,"cabal_sha256":"1e8140229d21489228aa79b820c23259f3c3a1b86e13e6f9c2ad0c48d86d1912"},{"flags":["-old-bytestring","-old-time"],"src_sha256":"b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de","version":"0.5.1.1","package":"tar","source":"hackage","revision":2,"cabal_sha256":"7a715414c4d494c9048cfb6d7634e07e7732ca154cb8938dc85f6ea192192e8c"},{"flags":["-devel"],"src_sha256":"fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a","version":"3.1.2.1","package":"network","source":"hackage","revision":1,"cabal_sha256":"188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b"},{"flags":[],"src_sha256":"a01c1389f15d2cc2e847914737f706133bb11f0c5f8ee89711a36a25b7afa723","version":"2.6.3.0","package":"network-uri","source":"hackage","revision":0,"cabal_sha256":"d2d9ff3a80d9b2d1ff317a354bc0c56cc109c69a4c2449e5fc712d3ddce83ede"},{"flags":["-conduit10","-mtl1","+network-uri","-warn-as-error","-warp-tests"],"src_sha256":"0d6b368e43001c046660e0e209bf9795dc990cb45016447fcf92e822c22e1594","version":"4000.3.15","package":"HTTP","source":"hackage","revision":2,"cabal_sha256":"2ba9cfc40afbb231326c4ff685ae678c4454e449fd41672e5ca75fd757fe6ae6"},{"flags":[],"src_sha256":"525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba","version":"0.1.1.7","package":"base16-bytestring","source":"hackage","revision":3,"cabal_sha256":"0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3"},{"flags":[],"src_sha256":"af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638","version":"1.2.0.1","package":"base64-bytestring","source":"hackage","revision":0,"cabal_sha256":"f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac"},{"flags":["-exe"],"src_sha256":"52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd","version":"0.11.101.0","package":"cryptohash-sha256","source":"hackage","revision":4,"cabal_sha256":"b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602"},{"flags":["-example"],"src_sha256":"704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef","version":"0.1.3","package":"echo","source":"hackage","revision":1,"cabal_sha256":"5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f"},{"flags":[],"src_sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","version":"0.2.2.1","package":"edit-distance","source":"hackage","revision":1,"cabal_sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee"},{"flags":["+no-donna","+test-doctests","+test-hlint","+test-properties"],"src_sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","version":"0.0.5.0","package":"ed25519","source":"hackage","revision":3,"cabal_sha256":"fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa"},{"flags":["+ofd-locking"],"src_sha256":"8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2","version":"0.1.1.2","package":"lukko","source":"hackage","revision":0,"cabal_sha256":"c9d3fa30fb6ab2ba16e037586ca79be6e57ec5f00381b6ee5f293400dbdf5515"},{"flags":["-bundled-c-zlib","-non-blocking-ffi","-pkg-config"],"src_sha256":"04b5890dd69e992f8cd09570d81e9d5ecab19db8e82cbe47ba8e02c31c0631ba","version":"0.6.2.2","package":"zlib","source":"hackage","revision":0,"cabal_sha256":"eae95cb0cc80ff259de236b812072c4a74c6de398cb277ff0fba1148edc0253d"},{"flags":["+base48","+lukko","-mtl21","-old-directory","+use-network-uri"],"src_sha256":"9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17","version":"0.6.0.1","package":"hackage-security","source":"hackage","revision":4,"cabal_sha256":"25e49fa21996bb3db92e2a978fc01586e6f4053fe86a5069d7312b7c2beea419"},{"flags":[],"src_sha256":"c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914","version":"0.94.0.0","package":"regex-base","source":"hackage","revision":1,"cabal_sha256":"44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e"},{"flags":["-_regex-posix-clib"],"src_sha256":"251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521","version":"0.96.0.0","package":"regex-posix","source":"hackage","revision":1,"cabal_sha256":"690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3"},{"flags":[],"src_sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","version":"0.1.2.0","package":"resolv","source":"hackage","revision":0,"cabal_sha256":"0a9a6dd29706258ae60a5c22aecc140a40743b8f08fc324fd9984e7dfbf3a80d"},{"flags":["-debug-conflict-sets","-debug-expensive-assertions","-debug-tracetree","+lukko","+native-dns"],"src_sha256":null,"version":"3.4.0.0","package":"cabal-install","source":"local","revision":null,"cabal_sha256":null}]} diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 534065767d2..12e57de9a49 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -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 \ diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index 437c1204df3..0175fe6c8ec 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -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 diff --git a/lang/ghc/patches/patch-aclocal_m4 b/lang/ghc/patches/patch-aclocal_m4 index 2504fb16f31..57f5ec11aec 100644 --- a/lang/ghc/patches/patch-aclocal_m4 +++ b/lang/ghc/patches/patch-aclocal_m4 @@ -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" ;; diff --git a/lang/ghc/patches/patch-configure b/lang/ghc/patches/patch-configure index 6ca148483ca..084fee9325f 100644 --- a/lang/ghc/patches/patch-configure +++ b/lang/ghc/patches/patch-configure @@ -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 diff --git a/lang/ghc/patches/patch-ghc_mk b/lang/ghc/patches/patch-ghc_mk index d4f49457235..99e628b78a0 100644 --- a/lang/ghc/patches/patch-ghc_mk +++ b/lang/ghc/patches/patch-ghc_mk @@ -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)) diff --git a/lang/ghc/patches/patch-libraries_base_configure b/lang/ghc/patches/patch-libraries_base_configure new file mode 100644 index 00000000000..239152ea02a --- /dev/null +++ b/lang/ghc/patches/patch-libraries_base_configure @@ -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 diff --git a/lang/ghc/patches/patch-rts_Linker_c b/lang/ghc/patches/patch-rts_Linker_c deleted file mode 100644 index 8521108486e..00000000000 --- a/lang/ghc/patches/patch-rts_Linker_c +++ /dev/null @@ -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); - } - - // diff --git a/lang/ghc/patches/patch-testsuite_driver_testlib_py b/lang/ghc/patches/patch-testsuite_driver_testlib_py index 31272e3b03e..ae33c5f444c 100644 --- a/lang/ghc/patches/patch-testsuite_driver_testlib_py +++ b/lang/ghc/patches/patch-testsuite_driver_testlib_py @@ -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: diff --git a/lang/ghc/pkg/PFRAG.no_i386 b/lang/ghc/pkg/PFRAG.no_i386 index e00ca230a99..6c665cad66b 100644 --- a/lang/ghc/pkg/PFRAG.no_i386 +++ b/lang/ghc/pkg/PFRAG.no_i386 @@ -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 diff --git a/lang/ghc/pkg/PLIST b/lang/ghc/pkg/PLIST index 1ede33b361c..57d3b5dad3c 100644 --- a/lang/ghc/pkg/PLIST +++ b/lang/ghc/pkg/PLIST @@ -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