mirror of
https://github.com/termux-pacman/termux-packages.git
synced 2026-02-13 21:30:52 +00:00
@@ -1,37 +0,0 @@
|
||||
From db18d42bdeccf305695e477c74fc2a4141493c5e Mon Sep 17 00:00:00 2001
|
||||
From: Michael Cho <michael@michaelcho.dev>
|
||||
Date: Tue, 12 Aug 2025 18:55:45 -0400
|
||||
Subject: [PATCH] Fix build with Boost 1.89.0
|
||||
|
||||
Boost.System has been header-only since Boost 1.69 and will be dropping
|
||||
the compatibility stub library in Boost 1.89 (boostorg/system@7a495bb).
|
||||
|
||||
Since the `system` component is only needed for Boost < 1.69, it can be
|
||||
added to `BOOST_COMPONENTS` in the fallback find_package.
|
||||
|
||||
Signed-off-by: Michael Cho <michael@michaelcho.dev>
|
||||
---
|
||||
cmake/EthDependencies.cmake | 3 ++-
|
||||
libsolutil/CMakeLists.txt | 2 +-
|
||||
test/tools/CMakeLists.txt | 4 ++--
|
||||
3 files changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/cmake/EthDependencies.cmake
|
||||
+++ b/cmake/EthDependencies.cmake
|
||||
@@ -29,7 +29,7 @@ if (WIN32)
|
||||
option(Boost_USE_STATIC_RUNTIME "Link Boost against static C++ runtime libraries" ON)
|
||||
endif()
|
||||
|
||||
-set(BOOST_COMPONENTS "filesystem;unit_test_framework;program_options;system")
|
||||
+set(BOOST_COMPONENTS "filesystem;unit_test_framework;program_options")
|
||||
|
||||
# CMake >= 3.30 should not use the vendored boost
|
||||
if(POLICY CMP0167)
|
||||
@@ -50,6 +50,7 @@ else()
|
||||
if(POLICY CMP0167)
|
||||
cmake_policy(SET CMP0167 OLD)
|
||||
endif()
|
||||
+ list(APPEND BOOST_COMPONENTS system)
|
||||
find_package(Boost 1.67.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS})
|
||||
endif()
|
||||
endif()
|
||||
@@ -1,11 +1,10 @@
|
||||
TERMUX_PKG_HOMEPAGE=https://solidity.readthedocs.io
|
||||
TERMUX_PKG_HOMEPAGE=https://www.soliditylang.org/
|
||||
TERMUX_PKG_DESCRIPTION="An Ethereum smart contract-oriented language"
|
||||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION="0.8.30"
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_SRCURL=https://github.com/ethereum/solidity/releases/download/v${TERMUX_PKG_VERSION}/solidity_${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=5e8d58dff551a18205e325c22f1a3b194058efbdc128853afd75d31b0568216d
|
||||
TERMUX_PKG_VERSION="0.8.31"
|
||||
TERMUX_PKG_SRCURL=https://github.com/argotorg/solidity/releases/download/v${TERMUX_PKG_VERSION}/solidity_${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=1efcf5af92e39499ce64d9cb33ba1cc1aa43d0aba107472915d732bf4a31c837
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
TERMUX_PKG_DEPENDS="boost, libc++"
|
||||
TERMUX_PKG_BUILD_DEPENDS="boost-headers, fmt, nlohmann-json, range-v3"
|
||||
|
||||
@@ -6,7 +6,7 @@ range-v3 and nlohmann-json are headers only and not libraries
|
||||
)
|
||||
|
||||
add_library(solutil ${sources})
|
||||
-target_link_libraries(solutil PUBLIC Boost::boost Boost::filesystem Boost::system range-v3 fmt::fmt-header-only nlohmann_json::nlohmann_json)
|
||||
-target_link_libraries(solutil PUBLIC Boost::boost Boost::filesystem ${Boost_SYSTEM_LIBRARY} range-v3 fmt::fmt-header-only nlohmann_json::nlohmann_json)
|
||||
+target_link_libraries(solutil PUBLIC Boost::boost Boost::filesystem fmt::fmt-header-only)
|
||||
target_include_directories(solutil PUBLIC "${PROJECT_SOURCE_DIR}")
|
||||
add_dependencies(solutil solidity_BuildInfo.h)
|
||||
|
||||
Reference in New Issue
Block a user