Skip to content

Commit c3b82fb

Browse files
Upgrade Boost from 1.78.0 to 1.87.0
- Fixes MSVC C++20 typename bug in boost::process headers (fixed upstream in 1.82) - Boost.Process v1 shims still present in 1.87 (removed in 1.88+) - Remove hardcoded architecture=x86 from b2 build to support ARM64 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 59cf9fd commit c3b82fb

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ set (PATCH_DIR "${PROJECT_SOURCE_DIR}/patches/" CACHE STRING "Directory containi
187187
## Warning: ensure these are all upper-case names!
188188
set(BZIP2_DIR ${CONTRIB_BIN_SOURCE_DIR}/bzip2-1.0.5)
189189
set(ZLIB_DIR ${CONTRIB_BIN_SOURCE_DIR}/zlib-1.3.1)
190-
set(BOOST_DIR ${CONTRIB_BIN_SOURCE_DIR}/boost-1.81.0)
190+
set(BOOST_DIR ${CONTRIB_BIN_SOURCE_DIR}/boost-1.87.0)
191191
set(XERCES_DIR ${CONTRIB_BIN_SOURCE_DIR}/Xerces-C_3_2_0)
192192
set(LIBSVM_DIR ${CONTRIB_BIN_SOURCE_DIR}/libsvm-3.12)
193193
set(GLPK_DIR ${CONTRIB_BIN_SOURCE_DIR}/glpk-4.46)
@@ -223,9 +223,9 @@ set(ARCHIVE_ZLIB zlib-1.3.1.tar.gz)
223223
set(ARCHIVE_ZLIB_TAR zlib-1.3.1.tar)
224224
set(ARCHIVE_ZLIB_SHA256 "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23")
225225

226-
set(ARCHIVE_BOOST boost-1.81.0.tar.gz)
227-
set(ARCHIVE_BOOST_TAR boost-1.81.0.tar)
228-
set(ARCHIVE_BOOST_SHA256 "121da556b718fd7bd700b5f2e734f8004f1cfa78b7d30145471c526ba75a151c")
226+
set(ARCHIVE_BOOST boost-1.87.0.tar.gz)
227+
set(ARCHIVE_BOOST_TAR boost-1.87.0.tar)
228+
set(ARCHIVE_BOOST_SHA256 "f55c340aa49763b1925ccf02b2e83f35fdcf634c9d5164a2acb87540173c741d")
229229

230230
set(ARCHIVE_XERCES Xerces-C_3_2_0.tar.gz)
231231
set(ARCHIVE_XERCES_TAR Xerces-C_3_2_0.tar)

libraries.cmake/boost.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,11 @@ MACRO( OPENMS_CONTRIB_BUILD_BOOST)
184184

185185
# boost cmd (use b2 since sometimes the copying/symlinking from b2 to bjam fails)
186186
set (BOOST_CMD "./b2 ${BOOST_DEBUG_FLAGS} ${BOOST_ARCHITECTURE} toolset=${_boost_toolchain} -j ${_BOOST_PARALLEL_JOBS} --disable-icu link=${BOOST_BUILD_TYPE} cxxflags=-fPIC ${BOOST_EXTRA_CXXFLAGS} ${OSX_LIB_FLAG} ${OSX_DEPLOYMENT_FLAG} ${BOOST_LINKER_FLAGS} install --build-type=complete --layout=tagged --threading=single,multi")
187-
187+
188188
# boost install
189189
message(STATUS "Installing Boost libraries (${BOOST_CMD}) ...")
190-
execute_process(COMMAND ./b2 ${BOOST_DEBUG_FLAGS} ${BOOST_ARCHITECTURE} toolset=${_boost_toolchain}
191-
-j ${_BOOST_PARALLEL_JOBS}
190+
execute_process(COMMAND ./b2 ${BOOST_DEBUG_FLAGS} ${BOOST_ARCHITECTURE} toolset=${_boost_toolchain}
191+
-j ${_BOOST_PARALLEL_JOBS}
192192
--disable-icu
193193
-s NO_LZMA=1
194194
-s NO_ZSTD=1

0 commit comments

Comments
 (0)