#1855 fix release build

skalenetwork · Dec 18, 2024 · c8a7123 · c8a7123
1 parent 626921d
commit c8a7123
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 8 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 )
+3 −2		catchup/client/CatchupClientAgent.cpp
+2 −0		crypto/ConsensusEdDSASignature.h
+2 −1		crypto/CryptoManager.cpp
+1 −1		libBLS