Merge pull request #2974 from mariux64/fix-go-env-121

go: add missing go.env
mariux64 · Sep 8, 2023 · 3ab88dd · 3ab88dd
2 parents 7b42b09 + 8d9031e
commit 3ab88dd
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/go.be0 b/go.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION go-1.21.1-0
+# BEE_VERSION go-1.21.1-1
 
 # see also: https://golang.org/doc/install/source
 
@@ -61,9 +61,8 @@ mee_build() {
     cd ${S}/src
 
     export GOROOT_BOOTSTRAP=${B}/bootstrap-1.17.13
-    export GOROOT_FINAL=${LIBDIR}/go
     . ./make.bash --no-banner
-#     $GOTOOLDIR/dist banner
+    $GOTOOLDIR/dist banner
 
 }
 
@@ -96,7 +95,11 @@ mee_install() {
         fi
     done
 
-    #Install tools for go
+    # fix "golang.org/x/mod@v0.12.0: GOPROXY list is not the empty string, but contains no entries"
+    # Install env
+    cp -v ${S}/go.env ${D}${LIBDIR}/go
+
+    # Install tools for go
     mkdir -pv ${D}${LIBDIR}/go/pkg
     cp -rv ${S}/pkg/tool ${D}${LIBDIR}/go/pkg
     cp -rv ${S}/pkg/include ${D}${LIBDIR}/go/pkg