Hi Greg,

On Mon, Sep 21, 2020 at 12:19:55AM -0700, Greg Steuck wrote:
> In my attempts to port ghc 8.10.2 I didn't figure out how to avoid
> requiring threaded rts for ghc bootstrap. I propose we change the
> bootstrap ghc 8.6.4 to include libHSrts_thr.a. So far I confirmed that
> applying the patch below makes libHSrts_thr.a appear in the generated
> *xz file which is then good enough to bootstrap 8.6.4. I will verify
> that I can successfully bootstrap ghc-8.10.2.

Great.

> I don't have a full update yet because I've never updated the bootstrap
> before. Matthias, do you think you can rebuild and host the new
> bootstrap packages starting from this change?

Sure. The files are at the usual plase
(https://openbsd.dead-parrot.de/distfiles/), here are the checksums:

SHA256 (ghc-8.6.4.20200921-amd64-unknown-openbsd.tar.xz) = 
f8689b448404a66cdf6f60a6da5d38883a470b70303d44429ab52e5b5ada8d0e
SHA256 (ghc-8.6.4.20200921-i386-unknown-openbsd.tar.xz) = 
446673ac355ce6a17a500ead016314a764fafae6aff965f0a8526219ad7f2316
SHA256 (ghc-8.6.4.20200921-shlibs-amd64.tar.gz) = 
e191cd242eb322257aeb8388f2684dd465f23a852ac0b959e6563733740b1972
SHA256 (ghc-8.6.4.20200921-shlibs-i386.tar.gz) = 
0315b3f91613b7a3babebc0a5ba60aaa16d7be14a662a0cf11d888af0533a52c

> diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
> index 0168e13fe4c..f5f5c53c5ae 100644
> --- a/lang/ghc/Makefile
> +++ b/lang/ghc/Makefile
> @@ -217,9 +217,9 @@ _bootstrap_prepare:
>       echo GhcStage2HcOpts=-O -fasm >> ${WRKSRC}/mk/build.mk
>       echo SplitObjs=NO >> ${WRKSRC}/mk/build.mk
>       echo GhcLibWays=v >> ${WRKSRC}/mk/build.mk
> -     echo GhcRTSWays= >> ${WRKSRC}/mk/build.mk
> +     echo GhcRTSWays=thr >> ${WRKSRC}/mk/build.mk
>       echo GhcWithInterpreter=NO >> ${WRKSRC}/mk/build.mk
> -     echo GhcThreaded=NO >> ${WRKSRC}/mk/build.mk
> +     echo GhcThreaded=YES >> ${WRKSRC}/mk/build.mk
>       echo INTEGER_LIBRARY=integer-simple >> ${WRKSRC}/mk/build.mk
>       echo SRC_CC_OPTS+=-g -O0 >> ${WRKSRC}/mk/build.mk
>       echo HADDOCK_DOCS=NO >> ${WRKSRC}/mk/build.mk

That diff is ok, just also change BOOTSTRAP_DATE in Makefile to 20200921,
but do NOT yet touch BIN_VER. With that, ok kili@.

I'll now check wether 8.6.4 still builds with the new bootstrapper.

Ciao,
        Kili

Reply via email to