From 90d19b4f4ccd43aba4253accf45e0710d0b8c797 Mon Sep 17 00:00:00 2001
From: Jared Wolff <hello@jaredwolff.com>
Date: Sat, 10 Oct 2020 00:48:29 -0400
Subject: [PATCH] Updating FreeBSD to 12.1 target.

---
 .../Dockerfile.i686-unknown-freebsd            |  6 +++---
 .../Dockerfile.x86_64-unknown-freebsd          |  6 +++---
 docker/freebsd.sh                              | 18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename docker/{disabled => }/Dockerfile.i686-unknown-freebsd (60%)
 rename docker/{disabled => }/Dockerfile.x86_64-unknown-freebsd (58%)

diff --git a/docker/disabled/Dockerfile.i686-unknown-freebsd b/docker/Dockerfile.i686-unknown-freebsd
similarity index 60%
rename from docker/disabled/Dockerfile.i686-unknown-freebsd
rename to docker/Dockerfile.i686-unknown-freebsd
index dcbf42e04..71c768b51 100644
--- a/docker/disabled/Dockerfile.i686-unknown-freebsd
+++ b/docker/Dockerfile.i686-unknown-freebsd
@@ -9,6 +9,6 @@ RUN /xargo.sh
 COPY freebsd.sh /
 RUN /freebsd.sh i686
 
-ENV CARGO_TARGET_I686_UNKNOWN_FREEBSD_LINKER=i686-unknown-freebsd10-gcc \
-    CC_i686_unknown_freebsd=i686-unknown-freebsd10-gcc \
-    CXX_i686_unknown_freebsd=i686-unknown-freebsd10-g++
+ENV CARGO_TARGET_I686_UNKNOWN_FREEBSD_LINKER=i686-unknown-freebsd12-gcc \
+    CC_i686_unknown_freebsd=i686-unknown-freebsd12-gcc \
+    CXX_i686_unknown_freebsd=i686-unknown-freebsd12-g++
diff --git a/docker/disabled/Dockerfile.x86_64-unknown-freebsd b/docker/Dockerfile.x86_64-unknown-freebsd
similarity index 58%
rename from docker/disabled/Dockerfile.x86_64-unknown-freebsd
rename to docker/Dockerfile.x86_64-unknown-freebsd
index 5ca9aa16d..d43c14052 100644
--- a/docker/disabled/Dockerfile.x86_64-unknown-freebsd
+++ b/docker/Dockerfile.x86_64-unknown-freebsd
@@ -9,6 +9,6 @@ RUN /xargo.sh
 COPY freebsd.sh /
 RUN /freebsd.sh x86_64
 
-ENV CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd10-gcc \
-    CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-gcc \
-    CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-g++
+ENV CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd12-gcc \
+    CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-gcc \
+    CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-g++
diff --git a/docker/freebsd.sh b/docker/freebsd.sh
index b1ab3a5bc..68ff17e92 100755
--- a/docker/freebsd.sh
+++ b/docker/freebsd.sh
@@ -6,12 +6,12 @@ set -euo pipefail
 main() {
     local arch="${1}"
 
-    local binutils=2.25.1 \
-          gcc=5.3.0 \
-          target="${arch}-unknown-freebsd10"
+    local base_release=12.1
+          binutils=2.32 \
+          gcc=6.4.0 \
+          target="${arch}-unknown-freebsd12"
 
     local dependencies=(
-        bzip2
         ca-certificates
         curl
         g++
@@ -34,11 +34,11 @@ main() {
 
     mkdir "${td}"/{binutils,gcc}{,-build} "${td}/freebsd"
 
-    curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/binutils/binutils-${binutils}.tar.bz2" -O
-    tar -C "${td}/binutils" --strip-components=1 -xjf "binutils-${binutils}.tar.bz2"
+    curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/binutils/binutils-${binutils}.tar.gz" -O
+    tar -C "${td}/binutils" --strip-components=1 -xf "binutils-${binutils}.tar.gz"
 
-    curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/gcc/gcc-${gcc}/gcc-${gcc}.tar.bz2" -O
-    tar -C "${td}/gcc" --strip-components=1 -xjf "gcc-${gcc}.tar.bz2"
+    curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/gcc/gcc-${gcc}/gcc-${gcc}.tar.gz" -O
+    tar -C "${td}/gcc" --strip-components=1 -xf "gcc-${gcc}.tar.gz"
 
     pushd "${td}"
 
@@ -57,7 +57,7 @@ main() {
             ;;
     esac
 
-    curl --retry 3 -sSfL "http://ftp.freebsd.org/pub/FreeBSD/releases/${bsd_arch}/10.2-RELEASE/base.txz" -O
+    curl --retry 3 -sSfL "http://ftp.freebsd.org/pub/FreeBSD/releases/${bsd_arch}/${base_release}-RELEASE/base.txz" -O
     tar -C "${td}/freebsd" -xJf base.txz ./usr/include ./usr/lib ./lib
 
     cd binutils-build