diff --git a/Dockerfile b/Dockerfile index fe3dcf18..28b3b42e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,32 +7,40 @@ RUN apt-get update && \ if [ "$TARGETARCH" = "$BUILDARCH" ]; then \ rustup target list --installed > TARGET && \ echo gcc > LINKER && \ - apt-get install -y gcc libgcc-s1 cmake unixodbc-dev libltdl-dev pkg-config && \ + apt-get install -y gcc libgcc-s1 cmake make autoconf automake libtool pkg-config curl ca-certificates && \ LIBMULTIARCH=$(gcc -print-multiarch); \ LIBDIR="/lib/$LIBMULTIARCH"; \ USRLIBDIR="/usr/lib/$LIBMULTIARCH"; \ + HOST_TRIPLE=$(gcc -dumpmachine); \ elif [ "$TARGETARCH" = "arm64" ]; then \ echo aarch64-unknown-linux-gnu > TARGET && \ echo aarch64-linux-gnu-gcc > LINKER && \ dpkg --add-architecture arm64 && apt-get update && \ - apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross unixodbc-dev:arm64 libltdl-dev:arm64 && \ + apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross make autoconf automake libtool pkg-config curl ca-certificates && \ LIBDIR="/lib/aarch64-linux-gnu"; \ USRLIBDIR="/usr/lib/aarch64-linux-gnu"; \ + HOST_TRIPLE="aarch64-linux-gnu"; \ elif [ "$TARGETARCH" = "arm" ]; then \ echo armv7-unknown-linux-gnueabihf > TARGET && \ echo arm-linux-gnueabihf-gcc > LINKER && \ dpkg --add-architecture armhf && apt-get update && \ - apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang unixodbc-dev:armhf libltdl-dev:armhf && \ + apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang make autoconf automake libtool pkg-config curl ca-certificates && \ cargo install --force --locked bindgen-cli && \ SYSROOT=$(arm-linux-gnueabihf-gcc -print-sysroot); \ echo "--sysroot=$SYSROOT -I$SYSROOT/usr/include -I$SYSROOT/usr/include/arm-linux-gnueabihf" > BINDGEN_EXTRA_CLANG_ARGS; \ LIBDIR="/lib/arm-linux-gnueabihf"; \ USRLIBDIR="/usr/lib/arm-linux-gnueabihf"; \ + HOST_TRIPLE="arm-linux-gnueabihf"; \ else \ echo "Unsupported cross compilation target: $TARGETARCH"; \ exit 1; \ fi && \ - echo $USRLIBDIR > ODBC_LIBDIR && \ + ODBC_VERSION="2.3.12" && \ + curl -fsSL https://www.unixodbc.org/unixODBC-$ODBC_VERSION.tar.gz | tar -xz -C /tmp && \ + cd /tmp/unixODBC-$ODBC_VERSION && \ + CC=$(cat LINKER) ./configure --disable-shared --enable-static --host="$HOST_TRIPLE" --prefix=/opt/unixodbc && \ + make -j"$(nproc)" && make install && \ + echo /opt/unixodbc/lib > ODBC_LIBDIR && \ cp $LIBDIR/libgcc_s.so.1 /opt/sqlpage-libs/ && \ rustup target add $(cat TARGET) && \ cargo init . @@ -41,7 +49,6 @@ RUN apt-get update && \ COPY Cargo.toml Cargo.lock ./ RUN BINDGEN_EXTRA_CLANG_ARGS=$(cat BINDGEN_EXTRA_CLANG_ARGS || true) \ RS_ODBC_LINK_SEARCH=$(cat ODBC_LIBDIR) \ - PKG_CONFIG_ALL_STATIC=1 \ cargo build \ --target $(cat TARGET) \ --config target.$(cat TARGET).linker='"'$(cat LINKER)'"' \ @@ -51,7 +58,6 @@ RUN BINDGEN_EXTRA_CLANG_ARGS=$(cat BINDGEN_EXTRA_CLANG_ARGS || true) \ COPY . . RUN touch src/main.rs && \ RS_ODBC_LINK_SEARCH=$(cat ODBC_LIBDIR) \ - PKG_CONFIG_ALL_STATIC=1 \ cargo build \ --target $(cat TARGET) \ --config target.$(cat TARGET).linker='"'$(cat LINKER)'"' \