diff options
| author | vkalintiris <vasilis@netdata.cloud> | 2024-02-26 15:48:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-26 15:48:26 +0200 |
| commit | 0e7cde465cc456dd5a35ce7aba5b2e00631bca62 (patch) | |
| tree | 9ec688c9a293947794cc6e0a241a06388a046f84 | |
| parent | ca016406c3072cf5f7d2a28c36f4593ff33d67dc (diff) | |
Assorted build-related changes. (#16906)
* Rename endian.h to byte_order.h
The underlying issue is that non-relative
header search paths would pick up our own
endian.h. This should be fixed in a follow-up
PR.
* Do not include top-level source dir
* Move h2o dep from libnetdata to netdata binary.
* Update #endif comment.
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/libnetdata/byteorder.h (renamed from src/libnetdata/endian.h) | 6 | ||||
| -rw-r--r-- | src/libnetdata/os.h | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d6e9536bbc..c703309513 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -598,7 +598,7 @@ set(LIBNETDATA_FILES src/libnetdata/os.c src/libnetdata/os.h src/libnetdata/simple_hashtable.h - src/libnetdata/endian.h + src/libnetdata/byteorder.h src/libnetdata/onewayalloc/onewayalloc.c src/libnetdata/onewayalloc/onewayalloc.h src/libnetdata/popen/popen.c @@ -1464,7 +1464,7 @@ detect_systemd() add_library(libnetdata STATIC ${LIBNETDATA_FILES}) -target_include_directories(libnetdata BEFORE PUBLIC ${CONFIG_H_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src) +target_include_directories(libnetdata BEFORE PUBLIC ${CONFIG_H_DIR} ${CMAKE_SOURCE_DIR}/src) # pthread (FIXME: use find_package for this) @@ -1592,9 +1592,6 @@ target_include_directories(libnetdata BEFORE PUBLIC ${OPENSSL_INCLUDE_DIRS}) target_compile_options(libnetdata PUBLIC ${OPENSSL_CFLAGS_OTHER}) target_link_libraries(libnetdata PUBLIC ${OPENSSL_LDFLAGS}) -# h2o -target_link_libraries(libnetdata PUBLIC "$<$<BOOL:${ENABLE_H2O}>:h2o>") - # mnl pkg_check_modules(MNL libmnl) if(MNL_FOUND) @@ -2056,6 +2053,7 @@ target_link_libraries(netdata PRIVATE "$<$<BOOL:${MACOS}>:${IOKIT};${FOUNDATION}>" "$<$<BOOL:${ENABLE_SENTRY}>:sentry>" "$<$<BOOL:${ENABLE_WEBRTC}>:LibDataChannel::LibDataChannelStatic>" + "$<$<BOOL:${ENABLE_H2O}>:h2o>" ) # diff --git a/src/libnetdata/endian.h b/src/libnetdata/byteorder.h index 66f75cb1ad..28fc9e663e 100644 --- a/src/libnetdata/endian.h +++ b/src/libnetdata/byteorder.h @@ -1,5 +1,5 @@ -#ifndef LIBNETDATA_ENDIAN_H -#define LIBNETDATA_ENDIAN_H +#ifndef LIBNETDATA_BYTE_ORDER_H +#define LIBNETDATA_BYTE_ORDER_H /** compatibility header for endian.h * This is a simple compatibility shim to convert @@ -29,4 +29,4 @@ #define be64toh(x) OSSwapBigToHostInt64(x) #define le64toh(x) OSSwapLittleToHostInt64(x) -#endif /* LIBNETDATA_ENDIAN_H */ +#endif /* LIBNETDATA_BYTE_ORDER_H */ diff --git a/src/libnetdata/os.h b/src/libnetdata/os.h index 197548b0da..0e4a369635 100644 --- a/src/libnetdata/os.h +++ b/src/libnetdata/os.h @@ -37,7 +37,7 @@ int getsysctl(const char *name, int *mib, size_t miblen, void *ptr, size_t *len) #if __APPLE__ #include <sys/sysctl.h> -#include "endian.h" +#include "byteorder.h" #define GETSYSCTL_BY_NAME(name, var) getsysctl_by_name(name, &(var), sizeof(var)) int getsysctl_by_name(const char *name, void *ptr, size_t len); |