Merge branch 'main' into update-arm-compilers

Author: pat-s

docker/build/build.sh

@@ -473,13 +473,13 @@ for TARGET in $TARGETS; do
     # Build the requested freebsd binaries
     if [ "$XGOARCH" == "." ] || [ "$XGOARCH" == "amd64" ]; then
       echo "Compiling for freebsd/amd64..."
-      XGOOS="freebsd" XGOARCH="amd64" CC=x86_64-pc-freebsd12-gcc HOST=x86_64-pc-freebsd12 PREFIX=/freebsdcross/x86_64-pc-freebsd12 do_build
-      export PKG_CONFIG_PATH=/freebsdcross/x86_64-pc-freebsd12/lib/pkgconfig
+      XGOOS="freebsd" XGOARCH="amd64" CC=x86_64-pc-freebsd13-gcc HOST=x86_64-pc-freebsd13 PREFIX=/freebsdcross/x86_64-pc-freebsd13 do_build
+      export PKG_CONFIG_PATH=/freebsdcross/x86_64-pc-freebsd13/lib/pkgconfig
 
        if [[ "$USEMODULES" == false ]]; then
-        CC=x86_64-pc-freebsd12-gcc CXX=x86_64-pc-freebsd12-g++ GOOS=freebsd GOARCH=amd64 CGO_ENABLED=1 go get $V $X "${T[@]}" -d "$PACK_RELPATH"
+        CC=x86_64-pc-freebsd13-gcc CXX=x86_64-pc-freebsd13-g++ GOOS=freebsd GOARCH=amd64 CGO_ENABLED=1 go get $V $X "${T[@]}" -d "$PACK_RELPATH"
       fi
-      CC=x86_64-pc-freebsd12-gcc CXX=x86_64-pc-freebsd12-g++ GOOS=freebsd GOARCH=amd64 CGO_ENABLED=1 $GOBIN build $V $X $TP $BV "${MOD[@]}" "${T[@]}" "${LDF[@]}" "${GC[@]}" "${BM[@]}" -o "/build/$NAME-freebsd12-amd64$(extension freebsd)" "$PACK_RELPATH"
+      CC=x86_64-pc-freebsd13-gcc CXX=x86_64-pc-freebsd13-g++ GOOS=freebsd GOARCH=amd64 CGO_ENABLED=1 $GOBIN build $V $X $TP $BV "${MOD[@]}" "${T[@]}" "${LDF[@]}" "${GC[@]}" "${BM[@]}" -o "/build/$NAME-freebsd13-amd64$(extension freebsd)" "$PACK_RELPATH"
     fi
     if [ "$XGOARCH" == "." ] || [ "$XGOARCH" == "arm64" ]; then
       echo "skipping freebsd/arm64... as it is not yet supported"

docker/toolchain/Dockerfile

@@ -106,10 +106,10 @@ ENV PATH=/osxcross/target/bin:$PATH
 ###########################
 
 COPY prep_freebsd.sh /prep_freebsd.sh
-RUN chmod +x /prep_freebsd.sh && \
-  /prep_freebsd.sh
+#RUN chmod +x /prep_freebsd.sh && \
+#  /prep_freebsd.sh
 
-ENV PATH=/freebsdcross/x86_64-pc-freebsd12/bin:$PATH
+ENV PATH=/freebsdcross/x86_64-pc-freebsd13/bin:$PATH
 
 # Inject the new Go root distribution downloader and bootstrapper
 COPY bootstrap_pure.sh /bootstrap_pure.sh

docker/toolchain/prep_freebsd.sh

@@ -9,8 +9,8 @@
 # for their work on this subject which
 # I have been able to expand upon for cgo/golang
 
-freebsd_ver=12
-freebsd_full_ver=12.4
+freebsd_ver=13
+freebsd_full_ver=13.4
 binutils_ver=2.39
 gmp_ver=6.2.1
 mpfr_ver=4.1.1
@@ -35,7 +35,7 @@ cd /tmp/freebsdbuild && \
   tar -xf /tmp/freebsdbuild/base.txz ./lib/ ./usr/lib/ ./usr/include/ && \
   cd /freebsdcross/x86_64-pc-freebsd${freebsd_ver}/usr/lib && \
   find . -xtype l|xargs ls -l|grep ' /lib/' \
-    | awk '{print "ln -sf /freebsdcross/x86_64-pc-freebsd12"$11 " " $9}' \
+    | awk '{print "ln -sf /freebsdcross/x86_64-pc-freebsd13"$11 " " $9}' \
     | /bin/sh && \
   rm -rf /tmp/freebsdbuild && mkdir /tmp/freebsdbuild
 

xgo.bats

@@ -25,12 +25,12 @@
   [ "$status" -eq 0 ]
 }
 
-# FIXME:
-# @test "branches" {
-#   run go run xgo.go --remote https://github.com/rwcarlsen/cyan --branch memprof --targets "linux/amd64" --image="${IMAGEID}" github.com/rwcarlsen/cyan/cmd/cyan
-#   echo "$output"
-#   [ "$status" -eq 0 ]
-# }
+# FIXME: does not work, see https://github.com/techknowlogick/xgo/issues/260
+#@test "branches" {
+#  run go run xgo.go --remote https://github.com/rwcarlsen/cyan --branch memprof --targets "linux/amd64" --image="${IMAGEID}" github.com/rwcarlsen/cyan/cmd/cyan
+#  echo "$output"
+#  [ "$status" -eq 0 ]
+#}
 
 @test "eth smoke" {
   git clone --depth 1 https://github.com/ethereum/go-ethereum.git /tmp/eth
@@ -46,10 +46,12 @@
   [ "$status" -eq 0 ]
 }
 
-# FIXME:
-# @test "vikunja smoke" {
-#   git clone --depth 1 https://kolaente.dev/vikunja/api /tmp/vikunja
-#   run go run xgo.go --image="${IMAGEID}" --targets "darwin-10.6/amd64" /tmp/vikunja
-#   echo "$output"
-#   [ "$status" -eq 0 ]
-# }
+@test "vikunja smoke" {
+  export vikunja_path=/tmp/vikunja
+  git clone --depth 1 https://kolaente.dev/vikunja/api $vikunja_path
+  mkdir -p $vikunja_path/frontend/dist/
+  touch $vikunja_path/frontend/dist/index.html
+  run go run xgo.go --image="${IMAGEID}" --targets "darwin-10.6/amd64" $vikunja_path
+  echo "$output"
+  [ "$status" -eq 0 ]
+}