@@ -7,32 +7,40 @@ RUN apt-get update && \
77 if [ "$TARGETARCH" = "$BUILDARCH" ]; then \
88 rustup target list --installed > TARGET && \
99 echo gcc > LINKER && \
10- apt-get install -y gcc libgcc-s1 cmake unixodbc-dev libltdl-dev pkg-config && \
10+ apt-get install -y gcc libgcc-s1 cmake make autoconf automake libtool pkg-config curl ca-certificates && \
1111 LIBMULTIARCH=$(gcc -print-multiarch); \
1212 LIBDIR="/lib/$LIBMULTIARCH" ; \
1313 USRLIBDIR="/usr/lib/$LIBMULTIARCH" ; \
14+ HOST_TRIPLE=$(gcc -dumpmachine); \
1415 elif [ "$TARGETARCH" = "arm64" ]; then \
1516 echo aarch64-unknown-linux-gnu > TARGET && \
1617 echo aarch64-linux-gnu-gcc > LINKER && \
1718 dpkg --add-architecture arm64 && apt-get update && \
18- apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross unixodbc-dev:arm64 libltdl-dev:arm64 && \
19+ apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross make autoconf automake libtool pkg-config curl ca-certificates && \
1920 LIBDIR="/lib/aarch64-linux-gnu" ; \
2021 USRLIBDIR="/usr/lib/aarch64-linux-gnu" ; \
22+ HOST_TRIPLE="aarch64-linux-gnu" ; \
2123 elif [ "$TARGETARCH" = "arm" ]; then \
2224 echo armv7-unknown-linux-gnueabihf > TARGET && \
2325 echo arm-linux-gnueabihf-gcc > LINKER && \
2426 dpkg --add-architecture armhf && apt-get update && \
25- apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang unixodbc-dev:armhf libltdl-dev:armhf && \
27+ apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang make autoconf automake libtool pkg-config curl ca-certificates && \
2628 cargo install --force --locked bindgen-cli && \
2729 SYSROOT=$(arm-linux-gnueabihf-gcc -print-sysroot); \
2830 echo "--sysroot=$SYSROOT -I$SYSROOT/usr/include -I$SYSROOT/usr/include/arm-linux-gnueabihf" > BINDGEN_EXTRA_CLANG_ARGS; \
2931 LIBDIR="/lib/arm-linux-gnueabihf" ; \
3032 USRLIBDIR="/usr/lib/arm-linux-gnueabihf" ; \
33+ HOST_TRIPLE="arm-linux-gnueabihf" ; \
3134 else \
3235 echo "Unsupported cross compilation target: $TARGETARCH" ; \
3336 exit 1; \
3437 fi && \
35- echo $USRLIBDIR > ODBC_LIBDIR && \
38+ ODBC_VERSION="2.3.12" && \
39+ curl -fsSL https://www.unixodbc.org/unixODBC-$ODBC_VERSION.tar.gz | tar -xz -C /tmp && \
40+ cd /tmp/unixODBC-$ODBC_VERSION && \
41+ CC=$(cat LINKER) ./configure --disable-shared --enable-static --host="$HOST_TRIPLE" --prefix=/opt/unixodbc && \
42+ make -j"$(nproc)" && make install && \
43+ echo /opt/unixodbc/lib > ODBC_LIBDIR && \
3644 cp $LIBDIR/libgcc_s.so.1 /opt/sqlpage-libs/ && \
3745 rustup target add $(cat TARGET) && \
3846 cargo init .
@@ -41,7 +49,6 @@ RUN apt-get update && \
4149COPY Cargo.toml Cargo.lock ./
4250RUN BINDGEN_EXTRA_CLANG_ARGS=$(cat BINDGEN_EXTRA_CLANG_ARGS || true) \
4351 RS_ODBC_LINK_SEARCH=$(cat ODBC_LIBDIR) \
44- PKG_CONFIG_ALL_STATIC=1 \
4552 cargo build \
4653 --target $(cat TARGET) \
4754 --config target.$(cat TARGET).linker='"' $(cat LINKER)'"' \
@@ -51,7 +58,6 @@ RUN BINDGEN_EXTRA_CLANG_ARGS=$(cat BINDGEN_EXTRA_CLANG_ARGS || true) \
5158COPY . .
5259RUN touch src/main.rs && \
5360 RS_ODBC_LINK_SEARCH=$(cat ODBC_LIBDIR) \
54- PKG_CONFIG_ALL_STATIC=1 \
5561 cargo build \
5662 --target $(cat TARGET) \
5763 --config target.$(cat TARGET).linker='"' $(cat LINKER)'"' \
0 commit comments