freebsd12 download was moved to a different download location, so tes…

…t switching to 13
techknowlogick · Oct 31, 2024 · 0d991de · 0d991de
1 parent b21b7fd
commit 0d991de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/docker/build/build.sh b/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"

diff --git a/docker/toolchain/Dockerfile b/docker/toolchain/Dockerfile
@@ -100,7 +100,7 @@ COPY 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

diff --git a/docker/toolchain/prep_freebsd.sh b/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
@@ -36,7 +36,7 @@ cd /tmp/freebsdbuild && \
   tar -xf /tmp/freebsdbuild/base.txz --strip-components=2 lib/ usr/lib/ usr/include/ && \
   cd 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