diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e8a06bb2..b529a4103 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,8 +249,11 @@ if ( CONSENSUS ) set( SKALED_LATEST_STANDARD ON CACHE BOOL "Use latest standards" ) # depricated option. TODO: remove from consensus set( BUILD_TESTS OFF CACHE BOOL "Build tests" ) # do not build libbls tests add_subdirectory( libconsensus EXCLUDE_FROM_ALL) + target_compile_options( consensus PRIVATE -Wno-unused-variable ) # silence libff warnings + target_compile_options( bls PRIVATE -Wno-unused-variable ) # silence libff warnings else() add_subdirectory( libconsensus/libBLS ) + target_compile_options( bls PRIVATE -Wno-unused-variable ) # silence libff warnings set( BUILD_TESTS OFF CACHE BOOL "Build tests" ) # do not build libbls tests endif() diff --git a/deps/clean.sh b/deps/clean.sh index a8708ddbc..7edd55c17 100755 --- a/deps/clean.sh +++ b/deps/clean.sh @@ -114,6 +114,7 @@ rm -rf ./deps_inst rm -rf ./build echo "Cleaning archive files..." rm -f ./*.tar.gz +rm -f ./*.tar.bz2 rm -f ./*.zip echo "Cleaning upacked library folders..." rm -rf ./double-conversion @@ -148,6 +149,10 @@ rm -rf ./libunwind rm -rf ./gmp-6.1.2 rm -rf ./libff rm -rf ./pbc +rm -rf ./libscrypt +rm -rf ./snappy +rm -rf ./yaml-cpp +rm -rf ./ethash echo "Done (all clean)." #finish diff --git a/libconsensus b/libconsensus index 72d21fa71..58c1f2e00 160000 --- a/libconsensus +++ b/libconsensus @@ -1 +1 @@ -Subproject commit 72d21fa7121330b2af4eeee5bfe9559bd1114431 +Subproject commit 58c1f2e003ae651c8b5dc3e946e88998c8c82291 diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt index 4c5d284e5..b81783083 100644 --- a/libdevcore/CMakeLists.txt +++ b/libdevcore/CMakeLists.txt @@ -15,9 +15,9 @@ add_library(devcore ${sources} ${headers}) add_dependencies(devcore secp256k1) target_compile_options( devcore PRIVATE - -Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter + -Wno-deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized -Wno-error=class-memaccess - -Wno-nonnull + -Wno-nonnull -Wno-sign-compare -Wno-maybe-uninitialized ) # Needed to prevent including system-level boost headers: diff --git a/libdevcrypto/CMakeLists.txt b/libdevcrypto/CMakeLists.txt index 39741b469..3193ff705 100644 --- a/libdevcrypto/CMakeLists.txt +++ b/libdevcrypto/CMakeLists.txt @@ -4,6 +4,7 @@ file(GLOB HEADERS "*.h") add_library(devcrypto ${SOURCES} ${HEADERS}) target_compile_options( devcrypto PRIVATE -Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized + -Wno-unused-variable ) target_include_directories(devcrypto PRIVATE ${UTILS_INCLUDE_DIR}) target_link_libraries( devcrypto diff --git a/libethereum/CMakeLists.txt b/libethereum/CMakeLists.txt index 73316fbc1..f356513e9 100644 --- a/libethereum/CMakeLists.txt +++ b/libethereum/CMakeLists.txt @@ -5,7 +5,7 @@ add_library( ethereum ${sources} InstanceMonitor.cpp InstanceMonitor.h target_compile_options( ethereum PRIVATE -Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized - -Wno-nonnull + -Wno-nonnull -Wno-stringop-overflow -Wno-array-bounds -Wno-restrict ) target_include_directories( ethereum PRIVATE "${UTILS_INCLUDE_DIR}" ${SKUTILS_INCLUDE_DIRS} diff --git a/libhistoric/CMakeLists.txt b/libhistoric/CMakeLists.txt index 96476ed15..9437d1519 100644 --- a/libhistoric/CMakeLists.txt +++ b/libhistoric/CMakeLists.txt @@ -4,6 +4,7 @@ add_library( historic ${sources}) target_compile_options( historic PRIVATE -Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized + -Wno-stringop-overflow -Wno-array-bounds -Wno-restrict ) target_include_directories( historic PRIVATE "${UTILS_INCLUDE_DIR}" ${SKUTILS_INCLUDE_DIRS} diff --git a/libp2p/CMakeLists.txt b/libp2p/CMakeLists.txt index 721f7bdcd..f554f1d96 100644 --- a/libp2p/CMakeLists.txt +++ b/libp2p/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(p2p PUBLIC devcrypto devcore) target_include_directories(p2p SYSTEM PRIVATE ${CRYPTOPP_INCLUDE_DIR}) target_compile_options( p2p PRIVATE -Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized - -Wno-nonnull + -Wno-nonnull -Wno-format-overflow ) if(MINIUPNPC) diff --git a/libskale/CMakeLists.txt b/libskale/CMakeLists.txt index 41a1b9688..33126ec2f 100644 --- a/libskale/CMakeLists.txt +++ b/libskale/CMakeLists.txt @@ -58,7 +58,7 @@ target_link_libraries(skale PRIVATE ethereum web3jsonrpc historic skutils pthread ) target_compile_options( skale PRIVATE - -Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized + -Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter -Wno-unused-variable -Wno-error=maybe-uninitialized -Wno-nonnull ) diff --git a/libweb3jsonrpc/CMakeLists.txt b/libweb3jsonrpc/CMakeLists.txt index f2f4546b7..d69abc576 100644 --- a/libweb3jsonrpc/CMakeLists.txt +++ b/libweb3jsonrpc/CMakeLists.txt @@ -143,7 +143,7 @@ target_compile_options( web3jsonrpc PRIVATE -Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized -Wno-error=pessimizing-move -Wno-error=stringop-truncation - -Wno-nonnull + -Wno-nonnull -Wno-stringop-truncation ) target_link_libraries( web3jsonrpc diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a0a15a45e..fbead503a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -62,10 +62,11 @@ find_package(yaml-cpp CONFIG REQUIRED) add_executable(testeth ${sources} unittests/libethereum/InstanceMonitorTest.cpp) target_compile_options( testeth PRIVATE - -Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized + -Wno-error=deprecated-copy -Wno-error=unused-result -Wno-unused-parameter -Wno-error=unused-variable -Wno-maybe-uninitialized -Wno-error=pessimizing-move -Wno-error=format-overflow -Wno-error=stringop-truncation + -Wno-unused-variable ) if( APPLE ) target_compile_definitions( testeth PRIVATE __BUILDING_4_MAC_OS_X__=1 )