diff options
Diffstat (limited to 'lang/solidity/files')
4 files changed, 17 insertions, 21 deletions
diff --git a/lang/solidity/files/patch-CMakeLists.txt b/lang/solidity/files/patch-CMakeLists.txt index b1905e3dd572..1d9953551df8 100644 --- a/lang/solidity/files/patch-CMakeLists.txt +++ b/lang/solidity/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ --- CMakeLists.txt.orig 2024-09-04 09:02:02 UTC +++ CMakeLists.txt -@@ -52,15 +52,21 @@ mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES) +@@ -52,9 +52,6 @@ mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES) mark_as_advanced(IGNORE_VENDORED_DEPENDENCIES) mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES) @@ -10,18 +10,3 @@ # Let's find our dependencies include(EthDependencies) if (NOT IGNORE_VENDORED_DEPENDENCIES) - include(fmtlib) - include(nlohmann-json) - include(range-v3) -+else() -+ # fmtlib -+ find_package(fmt REQUIRED) -+ # nlohmann-json -+ find_package(nlohmann_json REQUIRED) -+ # range-v3 -+ add_library(range-v3 INTERFACE IMPORTED) -+ set_target_properties(range-v3 PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES ${RANGE_V3_INCLUDE_DIR}) - endif() - - find_package(Threads) diff --git a/lang/solidity/files/patch-libevmasm_Assembly.cpp b/lang/solidity/files/patch-libevmasm_Assembly.cpp index 21c549fb8adc..4a2ede8b79b0 100644 --- a/lang/solidity/files/patch-libevmasm_Assembly.cpp +++ b/lang/solidity/files/patch-libevmasm_Assembly.cpp @@ -1,6 +1,6 @@ ---- libevmasm/Assembly.cpp.orig 2024-05-21 09:44:13 UTC +--- libevmasm/Assembly.cpp.orig 2025-05-07 10:46:47 UTC +++ libevmasm/Assembly.cpp -@@ -54,6 +54,8 @@ std::map<std::string, std::shared_ptr<std::string cons +@@ -55,6 +55,8 @@ std::map<std::string, std::shared_ptr<std::string cons std::map<std::string, std::shared_ptr<std::string const>> Assembly::s_sharedSourceNames; diff --git a/lang/solidity/files/patch-libevmasm_Instruction.h b/lang/solidity/files/patch-libevmasm_Instruction.h index 36f47c312bee..3368d6e3f5df 100644 --- a/lang/solidity/files/patch-libevmasm_Instruction.h +++ b/lang/solidity/files/patch-libevmasm_Instruction.h @@ -1,8 +1,8 @@ ---- libevmasm/Instruction.h.orig 2023-07-19 09:24:46 UTC +--- libevmasm/Instruction.h.orig 2025-05-07 10:46:47 UTC +++ libevmasm/Instruction.h -@@ -27,6 +27,8 @@ - #include <libsolutil/Assertions.h> +@@ -28,6 +28,8 @@ #include <liblangutil/EVMVersion.h> + #include <liblangutil/Exceptions.h> +#undef MSIZE // remove MSIZE definition from <sys/params.h>, included by boost 1.66.0 + diff --git a/lang/solidity/files/patch-libyul_backends_evm_EVMDialect.cpp b/lang/solidity/files/patch-libyul_backends_evm_EVMDialect.cpp new file mode 100644 index 000000000000..5fc20b2ae032 --- /dev/null +++ b/lang/solidity/files/patch-libyul_backends_evm_EVMDialect.cpp @@ -0,0 +1,11 @@ +--- libyul/backends/evm/EVMDialect.cpp.orig 2025-05-08 16:10:03 UTC ++++ libyul/backends/evm/EVMDialect.cpp +@@ -56,6 +56,8 @@ std::tuple<size_t, size_t> constexpr verbatimIndexToAr + return std::make_tuple(_index - numRets * EVMDialect::verbatimMaxInputSlots, numRets); + } + ++#undef MSIZE // remove MSIZE definition from <sys/params.h>, included by boost 1.66.0 ++ + BuiltinFunctionForEVM createEVMFunction( + langutil::EVMVersion _evmVersion, + std::string const& _name, |