Skip to content

Commit 6d322f1

Browse files
authored
Merge pull request #16176 from ethereum/update_boost_1_70
update to boost 1.70.0 for non-windows builds
2 parents 29bba31 + a6a6081 commit 6d322f1

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

Changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ Bugfixes:
99
* Assembler: Fix not using a fixed-width type for IDs being assigned to subassemblies nested more than one level away, resulting in inconsistent `--asm-json` output between target architectures.
1010
* Yul Optimizer: Fix edge case in which invalid Yul code is produced by ExpressionSimplifier due to expressions being substituted that contain out-of-scope variables.
1111

12+
Build System:
13+
* Update to boost 1.70.0 for non-windows builds.
14+
1215
### 0.8.30 (2025-05-07)
1316

1417
Compiler Features:

cmake/EthDependencies.cmake

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,9 @@ if (WIN32)
4242
else()
4343
# Boost 1.65 is the first to also provide boost::get for rvalue-references (#5787).
4444
# Boost 1.67 moved container_hash into is own module.
45+
# Boost 1.69 boost::system is header-only and no longer needs to be fetched as component
4546
# Boost 1.70 comes with its own BoostConfig.cmake and is the new (non-deprecated) behavior
46-
find_package(Boost 1.70.0 QUIET COMPONENTS ${BOOST_COMPONENTS})
47-
if (NOT ${Boost_FOUND})
48-
# If the boost version is < 1.70.0, there is no boost config delivered with it, revert to old behavior
49-
# todo drop this once cmake minimum version >= 3.30 is reached
50-
if(POLICY CMP0167)
51-
cmake_policy(SET CMP0167 OLD)
52-
endif()
53-
list(APPEND BOOST_COMPONENTS system)
54-
find_package(Boost 1.67.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS})
55-
endif()
47+
find_package(Boost 1.70.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS})
5648
endif()
5749

5850
# If cmake is older than boost and boost is older than 1.70,

docs/installing-solidity.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ The following are dependencies for all builds of Solidity:
327327
| Windows, 3.13+ otherwise) | |
328328
+-----------------------------------+-------------------------------------------------------+
329329
| `Boost`_ (version 1.77+ on | C++ libraries. |
330-
| Windows, 1.67+ otherwise) | |
330+
| Windows, 1.70+ otherwise) | |
331331
+-----------------------------------+-------------------------------------------------------+
332332
| `Git`_ | Command-line tool for retrieving source code. |
333333
+-----------------------------------+-------------------------------------------------------+

0 commit comments

Comments
 (0)