Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Update boost, remove curl from sidechain plugin

Browse source
This commit is contained in:
serkixenos 2022-07-13 04:18:25 +02:00
parent 47023be7c5
commit 28ac8214ca
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile.18.04
View file

@ -58,9 +58,9 @@ EXPOSE 22
WORKDIR /home/peerplays/ WORKDIR /home/peerplays/
RUN \ RUN \
wget -c 'http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.tar.bz2/download' -O boost_1_67_0.tar.bz2 && \ wget -c 'https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2' -O boost_1_71_0.tar.bz2 && \
tar xjf boost_1_67_0.tar.bz2 && \ tar xjf boost_1_71_0.tar.bz2 && \
cd boost_1_67_0/ && \ cd boost_1_71_0/ && \
./bootstrap.sh && \ ./bootstrap.sh && \
./b2 install ./b2 install

2
libraries/CMakeLists.txt
View file

@ -1,4 +1,3 @@
add_subdirectory( vendor )
add_subdirectory( app ) add_subdirectory( app )
add_subdirectory( chain ) add_subdirectory( chain )
add_subdirectory( db ) add_subdirectory( db )
@ -8,4 +7,5 @@ add_subdirectory( net )
add_subdirectory( plugins ) add_subdirectory( plugins )
add_subdirectory( time ) add_subdirectory( time )
add_subdirectory( utilities ) add_subdirectory( utilities )
add_subdirectory( vendor )
add_subdirectory( wallet ) add_subdirectory( wallet )

2
libraries/plugins/peerplays_sidechain/CMakeLists.txt
View file

@ -42,7 +42,7 @@ unset(ENABLE_PEERPLAYS_ASSET_DEPOSITS)
unset(ENABLE_PEERPLAYS_ASSET_DEPOSITS CACHE) unset(ENABLE_PEERPLAYS_ASSET_DEPOSITS CACHE)
target_link_directories( peerplays_sidechain PUBLIC ${SHA3IUF_link_dirs} ) target_link_directories( peerplays_sidechain PUBLIC ${SHA3IUF_link_dirs} )
target_link_libraries( peerplays_sidechain PRIVATE curl graphene_plugin zmq ${SHA3IUF_libraries} ) target_link_libraries( peerplays_sidechain PRIVATE graphene_plugin zmq ${SHA3IUF_libraries} )
target_include_directories( peerplays_sidechain PUBLIC target_include_directories( peerplays_sidechain PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/include"
"${SHA3IUF_include_dirs}" ) "${SHA3IUF_include_dirs}" )

4
libraries/plugins/peerplays_sidechain/common/rpc_client.cpp
View file

@ -1,8 +1,6 @@
#include <graphene/peerplays_sidechain/common/rpc_client.hpp> #include <graphene/peerplays_sidechain/common/rpc_client.hpp>
#include <regex>
#include <sstream> #include <sstream>
#include <string>
#include <boost/asio/buffers_iterator.hpp> #include <boost/asio/buffers_iterator.hpp>
#include <boost/beast/core.hpp> #include <boost/beast/core.hpp>
@ -11,8 +9,6 @@
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#include <boost/xpressive/xpressive.hpp> #include <boost/xpressive/xpressive.hpp>
#include <curl/curl.h>
#include <fc/log/logger.hpp> #include <fc/log/logger.hpp>
namespace graphene { namespace peerplays_sidechain { namespace graphene { namespace peerplays_sidechain {