Skip to content

Commit 8f58c5e

Browse files
Dependency fixes for CLP core: (#224)
* Fix static linking for mongoc and mongocxx to allow linked exes to run in the execution container. * Use apt's prebuilt mariadb-c-connector in the execution container.
1 parent b1d9503 commit 8f58c5e

File tree

5 files changed

+3
-4
lines changed

5 files changed

+3
-4
lines changed

components/core/tools/scripts/lib_install/mongoc.sh

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ cd build
7272
cmake \
7373
-DCMAKE_BUILD_TYPE=Release \
7474
-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
75+
-DENABLE_ICU=OFF \
7576
-DENABLE_TESTS=OFF \
7677
..
7778

components/core/tools/scripts/lib_install/mongocxx.sh

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ cmake \
7474
-DCMAKE_BUILD_TYPE=Release \
7575
-DCMAKE_INSTALL_PREFIX=/usr/local \
7676
-DBUILD_SHARED_AND_STATIC_LIBS=ON \
77+
-DBUILD_SHARED_LIBS_WITH_STATIC_MONGOC=ON \
7778
-DENABLE_TESTS=OFF \
7879
..
7980

tools/docker-images/clp-execution-base-focal/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN mkdir -p ./tools/scripts/lib_install
99
ADD ./components/core/tools/scripts/lib_install ./tools/scripts/lib_install
1010

1111
RUN ./tools/docker-images/clp-execution-base-focal/setup-scripts/install-prebuilt-packages.sh
12-
RUN ./tools/docker-images/clp-execution-base-focal/setup-scripts/install-packages-from-source.sh
1312

1413
# Reset the working directory so that it's accessible by any user who runs the
1514
# container

tools/docker-images/clp-execution-base-focal/setup-scripts/install-packages-from-source.sh

-3
This file was deleted.

tools/docker-images/clp-execution-base-focal/setup-scripts/install-prebuilt-packages.sh

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apt-get update
44
DEBIAN_FRONTEND=noninteractive apt-get install -y \
55
checkinstall \
66
curl \
7+
libmariadb-dev \
78
python3 \
89
rsync \
910
zstd

0 commit comments

Comments
 (0)