Skip to content

Commit 87e8774

Browse files
committed
Update boost setup script
1 parent 1407338 commit 87e8774

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ ENV CFLAGS="-pipe -fstack-clash-protection -fstack-protector-strong -fno-plt -U_
6464
RUN \
6565
wget -O boost.tar.gz "https://archives.boost.io/release/$BOOST_VERSION_MAJOR.$BOOST_VERSION_MINOR.$BOOST_VERSION_PATCH/source/boost_${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_PATCH}.tar.gz" && \
6666
tar -xf boost.tar.gz && \
67-
mv boost_* boost
67+
mv boost_* boost && \
68+
cd boost && \
69+
./bootstrap.sh && \
70+
./b2 stage --stagedir=./ --with-headers
6871

6972
# build libtorrent
7073
RUN \
@@ -82,7 +85,7 @@ RUN \
8285
-DCMAKE_CXX_STANDARD=20 \
8386
-DCMAKE_INSTALL_PREFIX=/usr \
8487
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
85-
-DBOOST_ROOT=/boost \
88+
-DBOOST_ROOT=/boost/lib/cmake \
8689
-Ddeprecated-functions=OFF \
8790
$LIBBT_CMAKE_FLAGS && \
8891
cmake --build build -j $(nproc) && \
@@ -107,7 +110,7 @@ RUN \
107110
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
108111
-DCMAKE_INSTALL_PREFIX=/usr \
109112
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
110-
-DBOOST_ROOT=/boost \
113+
-DBOOST_ROOT=/boost/lib/cmake \
111114
-DGUI=OFF && \
112115
cmake --build build -j $(nproc) && \
113116
cmake --install build

manual_build/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ ENV CFLAGS="-pipe -fstack-clash-protection -fstack-protector-strong -fno-plt -U_
6464
RUN \
6565
wget -O boost.tar.gz "https://archives.boost.io/release/$BOOST_VERSION_MAJOR.$BOOST_VERSION_MINOR.$BOOST_VERSION_PATCH/source/boost_${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_PATCH}.tar.gz" && \
6666
tar -xf boost.tar.gz && \
67-
mv boost_* boost
67+
mv boost_* boost && \
68+
cd boost && \
69+
./bootstrap.sh && \
70+
./b2 stage --stagedir=./ --with-headers
6871

6972
# build libtorrent
7073
RUN \
@@ -82,7 +85,7 @@ RUN \
8285
-DCMAKE_CXX_STANDARD=20 \
8386
-DCMAKE_INSTALL_PREFIX=/usr \
8487
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
85-
-DBOOST_ROOT=/boost \
88+
-DBOOST_ROOT=/boost/lib/cmake \
8689
-Ddeprecated-functions=OFF \
8790
$LIBBT_CMAKE_FLAGS && \
8891
cmake --build build -j $(nproc) && \
@@ -107,7 +110,7 @@ RUN \
107110
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
108111
-DCMAKE_INSTALL_PREFIX=/usr \
109112
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
110-
-DBOOST_ROOT=/boost \
113+
-DBOOST_ROOT=/boost/lib/cmake \
111114
-DGUI=OFF && \
112115
cmake --build build -j $(nproc) && \
113116
cmake --install build

0 commit comments

Comments
 (0)