Skip to content

Commit fe69a5b

Browse files
committed
Update config for boost update
1 parent 243c31b commit fe69a5b

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

lib/upgrade-boost.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ git rm -rf doc/ more/ status/ tools/*/test/ --ignore-unmatch
116116
git rm -rf libs/*/examples libs/*/*/examples libs/*/test/ libs/*/benchmark/ libs/*/performance/ libs/*/example/ libs/*/doc/ libs/*/*/doc/ --ignore-unmatch
117117
# unused libraries, focusing on larger ones
118118
UNUSED="leaf nowide pfr json static_string stl_interfaces phoenix msm redis mysql log \
119-
geometry hana asio multiprecision beast qvm gil xpressive process \
120-
wave atomic polygon intrusive metaparse interprocess yap thread compute url test proto"
119+
geometry hana asio multiprecision beast qvm gil process parser charconv \
120+
wave atomic polygon metaparse interprocess yap thread compute url test proto"
121121

122122
for lib in $UNUSED; do
123123
git rm -rf boost/$lib/ boost/$lib.hpp libs/$lib/ --ignore-unmatch
124124
done
125125

126-
git rm -rf **/*.svg **/*.png **/*.jpg **/*.html **/*.htm **/*.gold **/*.json --ignore-unmatch
126+
git rm -rf **/*.svg **/*.png **/*.jpg **/*.html **/*.htm **/*.gold --ignore-unmatch
127127
git rm -rf **/*.pdf **/*.manifest **/*.css **/*.md **/*.qbk **/*.rst **/*.txt --ignore-unmatch
128128
git commit -m "upgrading to boost v${boost_version}; pruning files"
129129

make/libraries

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,18 @@ $(BOOST)/user-config.jam:
220220
echo "#using mpi : /path/to/mpicxx ;" >> $(BOOST)/user-config.jam
221221
echo "using mpi ;" >> $(BOOST)/user-config.jam
222222

223-
$(BOOST)/stage/lib/libboost_serialization.so: $(BOOST)/stage/lib/libboost_mpi.so
224-
$(BOOST)/stage/lib/libboost_mpi.so: $(BOOST)/user-config.jam
225-
@mkdir -p $(dir $@)
223+
224+
$(BOOST)/b2:
226225
cd $(BOOST); ./bootstrap.sh
226+
227+
$(BOOST)/stage/lib/libboost_serialization.so: $(BOOST)/stage/lib/libboost_mpi.so $(BOOST)/b2
228+
$(BOOST)/stage/lib/libboost_mpi.so: $(BOOST)/user-config.jam $(BOOST)/b2
229+
@mkdir -p $(dir $@)
227230
cd $(BOOST); ./b2 --user-config=user-config.jam --layout=system --with-mpi --with-serialization -j$(BOOST_PARALLEL_JOBS) variant=release link=shared threading=multi runtime-link=shared hardcode-dll-paths=true dll-path="$(BOOST_LIBRARY_ABSOLUTE_PATH)" cxxstd=11
228231

229-
$(BOOST)/stage/lib/libboost_serialization.dylib: $(BOOST)/stage/lib/libboost_mpi.dylib
230-
$(BOOST)/stage/lib/libboost_mpi.dylib: $(BOOST)/user-config.jam
232+
$(BOOST)/stage/lib/libboost_serialization.dylib: $(BOOST)/stage/lib/libboost_mpi.dylib $(BOOST)/b2
233+
$(BOOST)/stage/lib/libboost_mpi.dylib: $(BOOST)/user-config.jam $(BOOST)/b2
231234
@mkdir -p $(dir $@)
232-
cd $(BOOST); ./bootstrap.sh
233235
cd $(BOOST); ./b2 --user-config=user-config.jam --layout=system --with-mpi --with-serialization -j$(BOOST_PARALLEL_JOBS) variant=release link=shared threading=multi runtime-link=shared hardcode-dll-paths=true dll-path="$(BOOST_LIBRARY_ABSOLUTE_PATH)" cxxstd=11
234236
install_name_tool -add_rpath "$(BOOST_LIBRARY_ABSOLUTE_PATH)" "$(BOOST)/stage/lib/libboost_serialization.dylib"
235237
install_name_tool -id @rpath/libboost_serialization.dylib "$(BOOST)/stage/lib/libboost_serialization.dylib"

0 commit comments

Comments
 (0)