Skip to content

Commit

Permalink
Dependency fixes for CLP core: (#224)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
kirkrodrigues authored Jan 11, 2024
1 parent b1d9503 commit 8f58c5e
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions components/core/tools/scripts/lib_install/mongoc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ cd build
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-DENABLE_ICU=OFF \
-DENABLE_TESTS=OFF \
..

Expand Down
1 change: 1 addition & 0 deletions components/core/tools/scripts/lib_install/mongocxx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr/local \
-DBUILD_SHARED_AND_STATIC_LIBS=ON \
-DBUILD_SHARED_LIBS_WITH_STATIC_MONGOC=ON \
-DENABLE_TESTS=OFF \
..

Expand Down
1 change: 0 additions & 1 deletion tools/docker-images/clp-execution-base-focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ RUN mkdir -p ./tools/scripts/lib_install
ADD ./components/core/tools/scripts/lib_install ./tools/scripts/lib_install

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

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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y \
checkinstall \
curl \
libmariadb-dev \
python3 \
rsync \
zstd

0 comments on commit 8f58c5e

Please sign in to comment.