This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 160f86948b Check for SO_MARK in CMake build (#9854)
160f86948b is described below
commit 160f86948baec0469e0814c902197e7588fa9dc5
Author: JosiahWI <[email protected]>
AuthorDate: Fri Jun 16 10:05:42 2023 -0500
Check for SO_MARK in CMake build (#9854)
* Add support for POSIX Cap in CMake build (#9852)
This adds a new CMake option that is ON by default: ENABLE_POSIX_CAP.
If POSIX cap is not found, the configure step will fail and the user
must disable the feature explicitly.
* Fix file name
* Fix typo
* Use check_symbol_exists instead of a compile check
---
CMakeLists.txt | 2 +-
include/tscore/ink_config.h.cmake.in | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dafffdbe1..b7b9d230cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,12 +159,12 @@ include(find_ccache)
# Check for IO faculties
check_symbol_exists(IN6_IS_ADDR_UNSPECIFIED "netinet/in.h"
TS_HAS_IN6_IS_ADDR_UNSPECIFIED)
+check_symbol_exists(SO_MARK "sys/socket.h" TS_HAS_SO_MARK)
check_symbol_exists(TLS1_3_VERSION "${OPENSSL_INCLUDE_DIR}/openssl/ssl.h"
TS_USE_TLS13)
check_symbol_exists(OPENSSL_NO_TLS1_3 "${OPENSSL_INCLUDE_DIR}/ssl.h"
TS_NO_USE_TLS13)
if(TS_NO_USE_TLS13)
set(TS_USE_TLS13 FALSE CACHE)
endif()
-
check_symbol_exists(epoll_create "sys/epoll.h" TS_USE_EPOLL)
check_symbol_exists(kqueue "sys/event.h" TS_USE_KQUEUE)
set(CMAKE_REQUIRED_LIBRARIES uring)
diff --git a/include/tscore/ink_config.h.cmake.in
b/include/tscore/ink_config.h.cmake.in
index cc0446822d..3f5b8dd3fc 100644
--- a/include/tscore/ink_config.h.cmake.in
+++ b/include/tscore/ink_config.h.cmake.in
@@ -116,6 +116,7 @@ const int DEFAULT_STACKSIZE = @DEFAULT_STACK_SIZE@;
#cmakedefine01 TS_HAS_JEMALLOC
#cmakedefine01 TS_HAS_TCMALLOC
#cmakedefine01 TS_HAS_PROFILER
+#cmakedefine01 TS_HAS_SO_MARK
#cmakedefine01 TS_USE_DIAGS
#cmakedefine01 TS_USE_EPOLL
#cmakedefine01 TS_USE_FAST_SDK
