Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1855 fix release build #2058

Merged
merged 1 commit into from
Dec 20, 2024
+19 −8
Merged

#1855 fix release build #2058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
5 changes: 5 additions & 0 deletions deps/clean.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libconsensus
Open in desktop
Submodule libconsensus updated 4 files
+3 −2 catchup/client/CatchupClientAgent.cpp
+2 −0 crypto/ConsensusEdDSASignature.h
+2 −1 crypto/CryptoManager.cpp
+1 −1 libBLS
4 changes: 2 additions & 2 deletions libdevcore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions libdevcrypto/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libethereum/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions libhistoric/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion libp2p/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion libskale/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion libweb3jsonrpc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
Loading