@@ -53,17 +53,12 @@ WORKDIR /opt
53
53
ARG BOOST_DOT_VERSION="${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION}"
54
54
ARG BOOST_UNDERSCORE_VERSION="${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_PATCH_VERSION}"
55
55
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
67
62
68
63
69
64
WORKDIR /opt
@@ -85,13 +80,16 @@ RUN git fetch --all --tags && \
85
80
86
81
RUN mkdir build
87
82
WORKDIR $RDBASE/build
88
-
89
83
RUN echo "source /opt/emsdk/emsdk_env.sh > /dev/null 2>&1" >> ~/.bashrc
90
84
SHELL ["/bin/bash" , "-c" , "-l" ]
91
- RUN emcmake cmake -DBoost_INCLUDE_DIR=/opt/boost/include \
85
+ RUN emcmake cmake \
92
86
-DBOOST_ROOT=/opt/boost \
87
+ -DBoost_INCLUDE_DIR=/opt/boost \
93
88
-DBoost_NO_SYSTEM_PATHS=ON \
94
89
-DBoost_NO_BOOST_CMAKE=ON \
90
+ -DBOOST_LIBRARYDIR=/opt/boost/lib \
91
+ -DBoost_USE_STATIC_LIBS=ON \
92
+ -DBoost_USE_STATIC_RUNTIME=ON \
95
93
-DRDK_BUILD_FREETYPE_SUPPORT=ON \
96
94
-DRDK_BUILD_MINIMAL_LIB=ON \
97
95
-DRDK_BUILD_PYTHON_WRAPPERS=OFF \
0 commit comments