@@ -7,7 +7,7 @@ RUN apt-get update && \
7
7
if [ "$TARGETARCH" = "$BUILDARCH" ]; then \
8
8
rustup target list --installed > TARGET && \
9
9
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 pkg-config && \
11
11
LIBMULTIARCH=$(gcc -print-multiarch); \
12
12
LIBDIR="/lib/$LIBMULTIARCH" ; \
13
13
USRLIBDIR="/usr/lib/$LIBMULTIARCH" ; \
@@ -16,15 +16,15 @@ RUN apt-get update && \
16
16
echo aarch64-unknown-linux-gnu > TARGET && \
17
17
echo aarch64-linux-gnu-gcc > LINKER && \
18
18
dpkg --add-architecture arm64 && apt-get update && \
19
- apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross unixodbc-dev:arm64 libltdl-dev:arm64 pkg-config && \
19
+ apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross pkg-config && \
20
20
LIBDIR="/lib/aarch64-linux-gnu" ; \
21
21
USRLIBDIR="/usr/lib/aarch64-linux-gnu" ; \
22
22
HOST_TRIPLE="aarch64-linux-gnu" ; \
23
23
elif [ "$TARGETARCH" = "arm" ]; then \
24
24
echo armv7-unknown-linux-gnueabihf > TARGET && \
25
25
echo arm-linux-gnueabihf-gcc > LINKER && \
26
26
dpkg --add-architecture armhf && apt-get update && \
27
- apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang unixodbc-dev:armhf libltdl-dev:armhf pkg-config && \
27
+ apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang pkg-config && \
28
28
cargo install --force --locked bindgen-cli && \
29
29
SYSROOT=$(arm-linux-gnueabihf-gcc -print-sysroot); \
30
30
echo "--sysroot=$SYSROOT -I$SYSROOT/usr/include -I$SYSROOT/usr/include/arm-linux-gnueabihf" > BINDGEN_EXTRA_CLANG_ARGS; \
@@ -35,27 +35,26 @@ RUN apt-get update && \
35
35
echo "Unsupported cross compilation target: $TARGETARCH" ; \
36
36
exit 1; \
37
37
fi && \
38
- echo $USRLIBDIR > ODBC_LIBDIR && \
39
38
cp $LIBDIR/libgcc_s.so.1 /opt/sqlpage-libs/ && \
40
39
rustup target add $(cat TARGET) && \
41
40
cargo init .
42
41
43
42
# Build dependencies (creates a layer that avoids recompiling dependencies on every build)
44
43
COPY Cargo.toml Cargo.lock ./
45
44
RUN BINDGEN_EXTRA_CLANG_ARGS=$(cat BINDGEN_EXTRA_CLANG_ARGS || true) \
46
- RS_ODBC_LINK_SEARCH=$(cat ODBC_LIBDIR) \
47
45
cargo build \
48
46
--target $(cat TARGET) \
49
47
--config target.$(cat TARGET).linker='"' $(cat LINKER)'"' \
48
+ --features odbc-static \
50
49
--profile superoptimized
51
50
52
51
# Build the project
53
52
COPY . .
54
53
RUN touch src/main.rs && \
55
- RS_ODBC_LINK_SEARCH=$(cat ODBC_LIBDIR) \
56
54
cargo build \
57
55
--target $(cat TARGET) \
58
56
--config target.$(cat TARGET).linker='"' $(cat LINKER)'"' \
57
+ --features odbc-static \
59
58
--profile superoptimized && \
60
59
mv target/$(cat TARGET)/superoptimized/sqlpage sqlpage.bin
61
60
0 commit comments