gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔧 build(fix aarch64 warning): ignore compile warning

Browse Source
This commit is contained in:
yangwei
2024-11-27 19:50:50 +08:00
parent 405a62826e
commit 35f3ec6e73
11 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/linenoise/CMakeLists.txt vendored
View File

@@ -1,2 +1,4 @@
add_library(linenoise STATIC linenoise.c) add_library(linenoise STATIC linenoise.c)
target_include_directories(linenoise PUBLIC ${CMAKE_CURRENT_LIST_DIR}) target_include_directories(linenoise PUBLIC ${CMAKE_CURRENT_LIST_DIR})
target_compile_options(linenoise PRIVATE -Wno-error=type-limits)

1
infra/exdata/test/CMakeLists.txt
View File

@@ -8,7 +8,6 @@ target_link_libraries(
gtest_exdata gtest_exdata
exdata exdata
gtest gtest
gmock
) )
include(GoogleTest) include(GoogleTest)

1
infra/module_manager/test/CMakeLists.txt
View File

@@ -11,7 +11,6 @@ target_link_libraries(
dl dl
"-rdynamic" "-rdynamic"
gtest gtest
gmock
) )
include(GoogleTest) include(GoogleTest)

4
infra/monitor/monitor_private.h
View File

@@ -243,7 +243,7 @@ extern "C"
struct timeval time_now; struct timeval time_now;
struct stm_stat *stat; struct stm_stat *stat;
struct stm_spinlock *lock; // for dynamic register command, conn_close_cb struct stm_spinlock *lock; // for dynamic register command, conn_close_cb
int (*gettime_cb)(struct timeval *tv, struct timezone *tz); int (*gettime_cb)(struct timeval *tv, void *tz);
struct monitor_connection current_conn; struct monitor_connection current_conn;
struct stm_pktdump_runtime *packet_dump; struct stm_pktdump_runtime *packet_dump;
@@ -282,7 +282,7 @@ extern "C"
/************************************************************************************************************/ /************************************************************************************************************/
/* monitor call gettimeofday(2) by default */ /* monitor call gettimeofday(2) by default */
struct stellar_monitor_config *stellar_monitor_config_new(const char *toml); struct stellar_monitor_config *stellar_monitor_config_new(const char *toml);
int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, struct timezone *tz)); int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, void *tz));
struct stellar_monitor *stellar_monitor_get(void); struct stellar_monitor *stellar_monitor_get(void);
struct stm_connection_manager *stm_connection_insert(struct evhttp_connection *evconn); struct stm_connection_manager *stm_connection_insert(struct evhttp_connection *evconn);
void stm_connection_update(struct stm_connection_manager *conn_mgr, const struct evhttp_connection *evconn); void stm_connection_update(struct stm_connection_manager *conn_mgr, const struct evhttp_connection *evconn);

2
infra/monitor/monitor_server.c
View File

@@ -194,7 +194,7 @@ static void stm_server_set_default_cfg(struct stellar_monitor_config *config)
config->output_interval_ms = STM_STAT_OUTPUT_INTERVAL_MS; config->output_interval_ms = STM_STAT_OUTPUT_INTERVAL_MS;
} }
int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, struct timezone *tz)) int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, void *tz))
{ {
if (NULL == gettime_cb) if (NULL == gettime_cb)
{ {

2
infra/packet_manager/packet_helper.h
View File

@@ -405,6 +405,8 @@ static inline uint16_t gre0_hdr_get_offset(const struct gre0_hdr *hdr)
} }
} }
#pragma GCC diagnostic warning "-Warray-bounds"
static inline uint32_t gre0_hdr_get_key(const struct gre0_hdr *hdr) static inline uint32_t gre0_hdr_get_key(const struct gre0_hdr *hdr)
{ {
if (gre0_hdr_get_key_flag(hdr)) if (gre0_hdr_get_key_flag(hdr))

2
test/lpi_plus/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ target_include_directories(gtest_lpip PRIVATE ${CMAKE_SOURCE_DIR}/decoders/)
target_link_libraries( target_link_libraries(
gtest_lpip PRIVATE stellar_lib cjson-static gtest_lpip PRIVATE stellar_lib cjson-static
dl "-rdynamic" dl "-rdynamic"
gtest gmock gtest
) )
#target_link_libraries(gtest_lpi PRIVATE -Wl,--whole-archive lpi -Wl,--no-whole-archive) #target_link_libraries(gtest_lpi PRIVATE -Wl,--whole-archive lpi -Wl,--no-whole-archive)

1
tools/monitor/CMakeLists.txt
View File

@@ -10,6 +10,7 @@ set (STELLAR-DUMP-PATCH-FILE ${CMAKE_SOURCE_DIR}/tools/monitor/stellar-dump.patc
set (STELLAR-DUMP-PATCH-CMD ${CMAKE_SOURCE_DIR}/tools/monitor/stellar-dump-update.sh) set (STELLAR-DUMP-PATCH-CMD ${CMAKE_SOURCE_DIR}/tools/monitor/stellar-dump-update.sh)
ExternalProject_Add(tcpdump PREFIX tcpdump ExternalProject_Add(tcpdump PREFIX tcpdump
URL ${CMAKE_SOURCE_DIR}/vendors/tcpdump-4.99.4.tar.gz URL ${CMAKE_SOURCE_DIR}/vendors/tcpdump-4.99.4.tar.gz
DOWNLOAD_EXTRACT_TIMESTAMP ON
URL_MD5 4f2d4a8a5fab017e5ebda156bfc86378 URL_MD5 4f2d4a8a5fab017e5ebda156bfc86378
PATCH_COMMAND sh -c "chmod +x ${STELLAR-DUMP-PATCH-CMD} && ${STELLAR-DUMP-PATCH-CMD} ${CMAKE_CURRENT_BINARY_DIR}/tcpdump/src/tcpdump ${STELLAR-DUMP-PATCH-FILE}" PATCH_COMMAND sh -c "chmod +x ${STELLAR-DUMP-PATCH-CMD} && ${STELLAR-DUMP-PATCH-CMD} ${CMAKE_CURRENT_BINARY_DIR}/tcpdump/src/tcpdump ${STELLAR-DUMP-PATCH-FILE}"
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DWITH_CRYPTO=OFF -DSTELLAR_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DSTELLAR_BINARY_DIR=${CMAKE_BINARY_DIR} -DASAN_OPTION=${ASAN_OPTION} CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DWITH_CRYPTO=OFF -DSTELLAR_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DSTELLAR_BINARY_DIR=${CMAKE_BINARY_DIR} -DASAN_OPTION=${ASAN_OPTION}

27
vendors/CMakeLists.txt vendored
View File

@@ -1,32 +1,26 @@
include(ExternalProject) include(ExternalProject)
# GoogleTest # GoogleTest
ExternalProject_Add(googletest ExternalProject_Add(googletest PREFIX googletest
PREFIX googletest URL ${CMAKE_CURRENT_SOURCE_DIR}/googletest-release-1.10.0.tgz
URL ${CMAKE_CURRENT_SOURCE_DIR}/googletest-release-1.8.0.tar.gz DOWNLOAD_EXTRACT_TIMESTAMP ON
URL_MD5 16877098823401d1bf2ed7891d7dce36 URL_MD5 ad777f4af22026493ea2782c611b8809
CMAKE_ARGS CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> BUILD_IN_SOURCE 1
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} BUILD_COMMAND make)
)
ExternalProject_Get_Property(googletest INSTALL_DIR) ExternalProject_Get_Property(googletest INSTALL_DIR)
file(MAKE_DIRECTORY ${INSTALL_DIR}/include) file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
add_library(gtest STATIC IMPORTED GLOBAL) add_library(gtest STATIC IMPORTED GLOBAL)
add_dependencies(gtest googletest) add_dependencies(gtest googletest)
set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libgtest.a) set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib64/libgtest.a)
set_property(TARGET gtest PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) set_property(TARGET gtest PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
set_property(TARGET gtest PROPERTY INTERFACE_LINK_LIBRARIES pthread) set_property(TARGET gtest PROPERTY INTERFACE_LINK_LIBRARIES pthread)
add_library(gmock STATIC IMPORTED GLOBAL)
add_dependencies(gmock googletest)
set_property(TARGET gmock PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libgmock.a)
set_property(TARGET gmock PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
#libcjson-1.7.17 #libcjson-1.7.17
ExternalProject_Add(cjson PREFIX cjson ExternalProject_Add(cjson PREFIX cjson
URL ${CMAKE_CURRENT_SOURCE_DIR}/libcjson_v1.7.17.tar.gz URL ${CMAKE_CURRENT_SOURCE_DIR}/libcjson_v1.7.17.tar.gz
DOWNLOAD_EXTRACT_TIMESTAMP ON
URL_MD5 4b2ab12cf065c079004aa44495ade04a URL_MD5 4b2ab12cf065c079004aa44495ade04a
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND make BUILD_COMMAND make
@@ -45,6 +39,7 @@ set_property(TARGET cjson-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTAL
#llhttp-9.1.3 #llhttp-9.1.3
ExternalProject_Add(llhttp PREFIX llhttp ExternalProject_Add(llhttp PREFIX llhttp
URL ${CMAKE_CURRENT_SOURCE_DIR}/llhttp-release-v9.2.1.tar.gz URL ${CMAKE_CURRENT_SOURCE_DIR}/llhttp-release-v9.2.1.tar.gz
DOWNLOAD_EXTRACT_TIMESTAMP ON
URL_MD5 355ecc90e622035e3e1693a96a0c233b URL_MD5 355ecc90e622035e3e1693a96a0c233b
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DBUILD_STATIC_LIBS=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_FLAGS="-fPIC") CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DBUILD_STATIC_LIBS=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_FLAGS="-fPIC")
ExternalProject_Get_Property(llhttp INSTALL_DIR) ExternalProject_Get_Property(llhttp INSTALL_DIR)
@@ -60,6 +55,7 @@ set_property(TARGET llhttp-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib
#brotli-v1.0.9 #brotli-v1.0.9
ExternalProject_Add(brotli PREFIX brotli ExternalProject_Add(brotli PREFIX brotli
URL ${CMAKE_CURRENT_SOURCE_DIR}/brotli-v1.0.9.tar.gz URL ${CMAKE_CURRENT_SOURCE_DIR}/brotli-v1.0.9.tar.gz
DOWNLOAD_EXTRACT_TIMESTAMP ON
URL_MD5 c2274f0c7af8470ad514637c35bcee7d URL_MD5 c2274f0c7af8470ad514637c35bcee7d
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
ExternalProject_Get_Property(brotli INSTALL_DIR) ExternalProject_Get_Property(brotli INSTALL_DIR)
@@ -84,6 +80,7 @@ set_property(TARGET brotli-enc-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/
ExternalProject_Add(libevent ExternalProject_Add(libevent
PREFIX libevent PREFIX libevent
URL ${CMAKE_CURRENT_SOURCE_DIR}/libevent-2.1.12-stable.tar.gz URL ${CMAKE_CURRENT_SOURCE_DIR}/libevent-2.1.12-stable.tar.gz
DOWNLOAD_EXTRACT_TIMESTAMP ON
URL_MD5 b5333f021f880fe76490d8a799cd79f4 URL_MD5 b5333f021f880fe76490d8a799cd79f4
CMAKE_ARGS -DEVENT__DISABLE_OPENSSL=ON -DEVENT__DISABLE_BENCHMARK=ON -DBUILD_TESTING=OFF -DEVENT__DISABLE_TESTS=ON -DEVENT__LIBRARY_TYPE=BOTH -DCMAKE_C_FLAGS="-fPIC" CMAKE_ARGS -DEVENT__DISABLE_OPENSSL=ON -DEVENT__DISABLE_BENCHMARK=ON -DBUILD_TESTING=OFF -DEVENT__DISABLE_TESTS=ON -DEVENT__LIBRARY_TYPE=BOTH -DCMAKE_C_FLAGS="-fPIC"
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>

BIN
vendors/googletest-release-1.10.0.tgz vendored Normal file
View File

Binary file not shown.

BIN
vendors/googletest-release-1.8.0.tar.gz vendored
View File

Binary file not shown.