Skip to content

Commit f8ae9b0

Browse files
Michel MLMichel ML
Michel ML
authored and
Michel ML
committed
wip
1 parent a730896 commit f8ae9b0

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

Dockerfile

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,12 @@ WORKDIR /opt
5353
ARG BOOST_DOT_VERSION="${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION}"
5454
ARG BOOST_UNDERSCORE_VERSION="${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_PATCH_VERSION}"
5555
RUN wget -q https://boostorg.jfrog.io/artifactory/main/release/${BOOST_DOT_VERSION}/source/boost_${BOOST_UNDERSCORE_VERSION}.tar.gz && \
56-
tar xzf boost_${BOOST_UNDERSCORE_VERSION}.tar.gz
57-
WORKDIR /opt/boost_${BOOST_UNDERSCORE_VERSION}
58-
RUN ./bootstrap.sh --prefix=/opt/boost --with-libraries=system,serialization,iostreams && \
59-
./b2 install \
60-
--with-system \
61-
--with-serialization \
62-
--with-iostreams \
63-
link=static \
64-
runtime-link=static \
65-
threading=multi \
66-
variant=release
56+
tar xzf boost_${BOOST_UNDERSCORE_VERSION}.tar.gz && \
57+
mv boost_${BOOST_UNDERSCORE_VERSION} /opt/boost
58+
59+
# No need to build Boost, we'll just use the headers
60+
ENV BOOST_ROOT=/opt/boost
61+
ENV Boost_INCLUDE_DIR=/opt/boost
6762

6863

6964
WORKDIR /opt
@@ -85,13 +80,16 @@ RUN git fetch --all --tags && \
8580

8681
RUN mkdir build
8782
WORKDIR $RDBASE/build
88-
8983
RUN echo "source /opt/emsdk/emsdk_env.sh > /dev/null 2>&1" >> ~/.bashrc
9084
SHELL ["/bin/bash", "-c", "-l"]
91-
RUN emcmake cmake -DBoost_INCLUDE_DIR=/opt/boost/include \
85+
RUN emcmake cmake \
9286
-DBOOST_ROOT=/opt/boost \
87+
-DBoost_INCLUDE_DIR=/opt/boost \
9388
-DBoost_NO_SYSTEM_PATHS=ON \
9489
-DBoost_NO_BOOST_CMAKE=ON \
90+
-DBOOST_LIBRARYDIR=/opt/boost/lib \
91+
-DBoost_USE_STATIC_LIBS=ON \
92+
-DBoost_USE_STATIC_RUNTIME=ON \
9593
-DRDK_BUILD_FREETYPE_SUPPORT=ON \
9694
-DRDK_BUILD_MINIMAL_LIB=ON \
9795
-DRDK_BUILD_PYTHON_WRAPPERS=OFF \

0 commit comments

Comments
 (0)