From 1ab90429ed1484e28f00dd6924271a5cab20a576 Mon Sep 17 00:00:00 2001 From: Daiki Mizukami Date: Thu, 8 Apr 2021 23:51:01 +0900 Subject: [PATCH] don't set `SQLITE3_LIB_DIR` in FreeBSD images the environment variable has broken procedural macro crates which depends on `libsqlite3-sys`, such as `migrations_macros`. even without the variable, `libsqlite3-sys` finds the correct path anyway. fixes #520. --- docker/Dockerfile.i686-unknown-freebsd | 3 +-- docker/Dockerfile.x86_64-unknown-freebsd | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.i686-unknown-freebsd b/docker/Dockerfile.i686-unknown-freebsd index 39de50f85..4341f8425 100644 --- a/docker/Dockerfile.i686-unknown-freebsd +++ b/docker/Dockerfile.i686-unknown-freebsd @@ -18,5 +18,4 @@ RUN /freebsd-extras.sh i686 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++ \ - I686_UNKNOWN_FREEBSD_OPENSSL_DIR=/usr/local/i686-unknown-freebsd12/ \ - SQLITE3_LIB_DIR=/usr/local/x86_64-unknown-freebsd12/lib/ + I686_UNKNOWN_FREEBSD_OPENSSL_DIR=/usr/local/i686-unknown-freebsd12/ diff --git a/docker/Dockerfile.x86_64-unknown-freebsd b/docker/Dockerfile.x86_64-unknown-freebsd index 297372e7d..61bc8b840 100644 --- a/docker/Dockerfile.x86_64-unknown-freebsd +++ b/docker/Dockerfile.x86_64-unknown-freebsd @@ -18,5 +18,4 @@ RUN /freebsd-extras.sh x86_64 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++ \ - X86_64_UNKNOWN_FREEBSD_OPENSSL_DIR=/usr/local/x86_64-unknown-freebsd12/ \ - SQLITE3_LIB_DIR=/usr/local/x86_64-unknown-freebsd12/lib/ + X86_64_UNKNOWN_FREEBSD_OPENSSL_DIR=/usr/local/x86_64-unknown-freebsd12/