diff --git a/go.be0 b/go.be0 index f978ca374..da3715539 100755 --- a/go.be0 +++ b/go.be0 @@ -1,14 +1,15 @@ #!/usr/bin/env beesh -# BEE_VERSION go-1.19.5-0 +# BEE_VERSION go-1.20.4-0 # see also: https://golang.org/doc/install/source # SRCURL[0]="https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz" #SRCURL[1]="https://redirector.gvt1.com/edgedl/go/go${PKGVERSION}.src.tar.gz" - SRCURL[0]="https://beehive.molgen.mpg.de/dbf727a4b0e365bf88d97cbfde590016/go1.4-bootstrap-20171003.tar.gz" -SRCURL[1]="https://beehive.molgen.mpg.de/cf07786f1cdabd882f1d82eea50a44b5/go1.19.5.src.tar.gz" +SRCURL[1]="https://beehive.molgen.mpg.de/4476707f05cf6915ec1173038dc357a9/go1.17.13.src.tar.gz" +# https://go.dev/dl/go1.20.4.src.tar.gz +SRCURL[2]="https://beehive.molgen.mpg.de/2ea74f4e87758e0fbeb4cc6d04d2e020/go1.20.4.src.tar.gz" # PATCHURL+=() @@ -18,8 +19,11 @@ sourcesubdir_append src mee_extract() { # extract bootstrap version of go-1.4 to arbitrary location - mkdir ${S}/bootstrap - bee_extract_do_tar "${1}" ${S}/bootstrap --strip-components 1 + mkdir ${S}/bootstrap-1.4 + bee_extract_do_tar "${1}" ${S}/bootstrap-1.4 --strip-components 1 + shift + mkdir ${S}/bootstrap-1.17.13 + bee_extract_do_tar "${1}" ${S}/bootstrap-1.17.13 --strip-components 1 shift bee_extract "${@}" } @@ -34,17 +38,30 @@ mee_extract() { mee_build() { - cd ${S}/../bootstrap/src + cd ${S}/../bootstrap-1.4/src + + # https://github.com/golang/go/issues/16906 "cannot load DWARF output ..." + CGO_ENABLED=0 \ + CFLAGS='-Wno-implicit-fallthrough -Wno-shift-negative-value' \ + ./make.bash + + echo "---- bootstrap 1.4 built ----" + + cd ${S}/../bootstrap-1.17.13/src # https://github.com/golang/go/issues/16906 "cannot load DWARF output ..." + export GOROOT_BOOTSTRAP=${S}/../bootstrap-1.4 + export GOROOT_FINAL=${LIBDIR}/go + CGO_ENABLED=0 \ CFLAGS='-Wno-implicit-fallthrough -Wno-shift-negative-value' \ ./make.bash - echo "---- bootstrap built ----" + echo "---- bootstrap 1.17.13 built ----" + cd ${S} - export GOROOT_BOOTSTRAP=${S}/../bootstrap + export GOROOT_BOOTSTRAP=${S}/../bootstrap-1.17.13 export GOROOT_FINAL=${LIBDIR}/go ./make.bash --no-clean } @@ -73,5 +90,5 @@ mee_install() { mkdir -pv ${D}${LIBDIR}/go/pkg cp -rv ${S}/../pkg/tool ${D}${LIBDIR}/go/pkg cp -rv ${S}/../pkg/include ${D}${LIBDIR}/go/pkg - cp -rv ${S}/../pkg/linux_amd64 ${D}${LIBDIR}/go/pkg +# cp -rv ${S}/../pkg/linux_amd64 ${D}${LIBDIR}/go/pkg }