On 2022/09/04 21:28, Matthias Kilian wrote: > FYI: to get the ghc bootstrap fuckup solved some way, I now took > the old bootstrap (ghc-8.10.7.20220419), manually replaced the > shared libs and uploaded the result (ghc-8.10.7.20220904). ghc is > currently building on my machine. If that succeeds, I'll just commit > the change. I've still no idea how to overcome the broken dependency > stuff in ghc-9.2 and thus how to build a working 9.2 bootstrap.
Sounds good to me. Note the syscall problem won't be apparent now until the kernel is changed back (see https://github.com/openbsd/src/commit/b7fd4d375d2a and https://github.com/openbsd/src/commit/92f40d6304fc) so if people want to look for problems (ports written in go are the most likely) the kernel commits will need backing out to test. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/lang/ghc/Makefile,v > retrieving revision 1.201 > diff -u -p -r1.201 Makefile > --- Makefile 3 Sep 2022 19:43:17 -0000 1.201 > +++ Makefile 4 Sep 2022 19:27:21 -0000 ok. > @@ -9,13 +9,13 @@ DPB_PROPERTIES = parallel > NO_CCACHE = Yes > > GHC_VERSION = 9.2.4 > -REVISION = 1 > +REVISION = 2 > DISTNAME = ghc-${GHC_VERSION} > CATEGORIES = lang devel > HOMEPAGE = https://www.haskell.org/ghc/ > > # Version of the precompiled binaries > -BIN_VER = 8.10.7.20220419 > +BIN_VER = 8.10.7.20220904 > > # lang/python needed for regression tests. > MODULES = lang/python > @@ -132,8 +132,6 @@ post-extract: > cd ${WRKSRC}/libraries/unix && \ > mkdir -p System/OpenBSD && \ > install -m 644 ${FILESDIR}/Process.hsc System/OpenBSD > - chmod 644 ${WRKDIR}/ghc-*-shlibs-*/lib*.so* # XXX > - -cp /usr/lib/libc.so.96.1 ${WRKDIR}/ghc-*-shlibs-*/ # XXX > > BOOTSTRAP_SHLIBS = ${WRKDIR}/ghc-${BIN_VER}-shlibs-${MACHINE_ARCH} > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/lang/ghc/distinfo,v > retrieving revision 1.62 > diff -u -p -r1.62 distinfo > --- distinfo 31 Jul 2022 19:27:03 -0000 1.62 > +++ distinfo 4 Sep 2022 19:27:21 -0000 > @@ -1,8 +1,8 @@ > -SHA256 (ghc/ghc-8.10.7.20220419-amd64-unknown-openbsd.tar.xz) = > JFa1/AJu2bhYiL80OrKWy0li7ynmO99eCnc9nA+DjSc= > -SHA256 (ghc/ghc-8.10.7.20220419-shlibs-amd64.tar.gz) = > zjDaNaYT1AnlqEqupIxr8aoALbQao/a3dypGrDL9X7g= > +SHA256 (ghc/ghc-8.10.7.20220904-amd64-unknown-openbsd.tar.xz) = > bH1nISV38j0ogaqDQuRycw55YaE031EEe6XR4vyw+1Q= > +SHA256 (ghc/ghc-8.10.7.20220904-shlibs-amd64.tar.gz) = > icwBqEzjeDiW42tw/9kTHC7/Hso9+fjjZaBJ5DF9chY= > SHA256 (ghc/ghc-9.2.4-src.tar.xz) = > FSE4iAZKDsTncj0HXzG4emeM4IUXc9WLRO96o96ZZFg= > SHA256 (ghc/ghc-9.2.4-testsuite.tar.xz) = > 1YaTrD0bx/Agxd/ZLBD2MRPcXW/YzHiTlKr7Qql+sC0= > -SIZE (ghc/ghc-8.10.7.20220419-amd64-unknown-openbsd.tar.xz) = 35749140 > -SIZE (ghc/ghc-8.10.7.20220419-shlibs-amd64.tar.gz) = 2904669 > +SIZE (ghc/ghc-8.10.7.20220904-amd64-unknown-openbsd.tar.xz) = 35756988 > +SIZE (ghc/ghc-8.10.7.20220904-shlibs-amd64.tar.gz) = 3686128 > SIZE (ghc/ghc-9.2.4-src.tar.xz) = 24632968 > SIZE (ghc/ghc-9.2.4-testsuite.tar.xz) = 3193376 >