update FreeBSD image to 12.2

also, use OpenSSL from the base system
cross-rs · Aug 9, 2021 · 9a2b65c · 9a2b65c
1 parent b8bcd07
commit 9a2b65c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/docker/freebsd-extras.sh b/docker/freebsd-extras.sh
@@ -7,7 +7,6 @@ main() {
     local arch="${1}"
 
     local sqlite_ver=3.35.5_3,1 \
-          openssl_ver=1.1.1k_1,1 \
           target="${arch}-unknown-freebsd12"
 
     local td
@@ -27,20 +26,12 @@ main() {
             ;;
     esac
 
-    # Adding openssl lib
-    curl --retry 3 -sSfL "https://pkg.freebsd.org/FreeBSD:12:${bsd_arch}/quarterly/All/openssl-${openssl_ver}.txz" -O
-    tar -C "${td}/openssl" -xJf openssl-${openssl_ver}.txz /usr/local/lib /usr/local/include/
-
     # Adding sqlite3
     curl --retry 3 -sSfL "https://pkg.freebsd.org/FreeBSD:12:${bsd_arch}/quarterly/All/sqlite3-${sqlite_ver}.txz" -O
     tar -C "${td}/sqlite" -xJf sqlite3-${sqlite_ver}.txz /usr/local/lib
 
     # Copy the linked library
     local destdir="/usr/local/${target}"
-    cp -r "${td}/openssl/usr/local/include" "${destdir}"
-    cp "${td}/openssl/usr/local/lib"/lib{crypto,ssl}.a "${destdir}/lib"
-    cp "${td}/openssl/usr/local/lib"/lib{crypto,ssl}.so.11 "${destdir}/lib"
-    cp "${td}/openssl/usr/local/lib"/lib{crypto,ssl}.so "${destdir}/lib"
     cp "${td}/sqlite/usr/local/lib/libsqlite3.so.0.8.6" "${destdir}/lib"
     cp "${td}/sqlite/usr/local/lib/libsqlite3.so" "${destdir}/lib"
     cp "${td}/sqlite/usr/local/lib/libsqlite3.so.0" "${destdir}/lib"

diff --git a/docker/freebsd.sh b/docker/freebsd.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 main() {
     local arch="${1}"
 
-    local base_release=12.1 \
+    local base_release=12.2 \
           binutils=2.32 \
           gcc=6.4.0 \
           target="${arch}-unknown-freebsd12"
@@ -78,6 +78,9 @@ main() {
     cp "${td}/freebsd/usr/lib"/lib{c,util,m}.a "${destdir}/lib"
     cp "${td}/freebsd/usr/lib"/lib{rt,execinfo}.so.1 "${destdir}/lib"
     cp "${td}/freebsd/usr/lib"/{crt1,Scrt1,crti,crtn}.o "${destdir}/lib"
+    cp "${td}/freebsd/usr/lib"/lib{crypto,ssl}.a "${destdir}/lib"
+    cp "${td}/freebsd/usr/lib"/libssl.so.111 "${destdir}/lib"
+    cp "${td}/freebsd/usr/lib"/lib{crypto,ssl}.so "${destdir}/lib"
 
     ln -s libc.so.7 "${destdir}/lib/libc.so"
     ln -s libc++.so.1 "${destdir}/lib/libc++.so"