diff options
| author | Theo Buehler <tb@openbsd.org> | 2024-10-02 12:58:41 +0200 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2024-10-02 12:58:41 +0200 |
| commit | 8bc62b897aaa307cb99e8f1c6225afbfb4b34b16 (patch) | |
| tree | bcd0d13a1fb0031319a2c96d88b22152c6a9b7ef | |
| parent | 582d50beeb036fc6376eaa3435ed698c8ec1b761 (diff) | |
| parent | 69c26f31f2b95034358c3c3896db5c617c5783e1 (diff) | |
| download | portable-8bc62b897aaa307cb99e8f1c6225afbfb4b34b16.tar.gz portable-8bc62b897aaa307cb99e8f1c6225afbfb4b34b16.tar.bz2 portable-8bc62b897aaa307cb99e8f1c6225afbfb4b34b16.zip | |
Land #1102 - fix syslog_r and pipe2 detection
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d2c96f1..2b6294b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -296,7 +296,7 @@ if(HAVE_GETPROGNAME) | |||
| 296 | add_definitions(-DHAVE_GETPROGNAME) | 296 | add_definitions(-DHAVE_GETPROGNAME) |
| 297 | endif() | 297 | endif() |
| 298 | 298 | ||
| 299 | check_symbol_exists(syslog_r "syslog.h" "stdarg.h" HAVE_SYSLOG_R) | 299 | check_symbol_exists(syslog_r "syslog.h;stdarg.h" HAVE_SYSLOG_R) |
| 300 | if(HAVE_SYSLOG_R) | 300 | if(HAVE_SYSLOG_R) |
| 301 | add_definitions(-DHAVE_SYSLOG_R) | 301 | add_definitions(-DHAVE_SYSLOG_R) |
| 302 | endif() | 302 | endif() |
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8f647b1..845c23f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt | |||
| @@ -693,7 +693,7 @@ set_tests_properties(shutdowntest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_D | |||
| 693 | # Emscripten does not support socketpair syscall. | 693 | # Emscripten does not support socketpair syscall. |
| 694 | if(NOT (CMAKE_SYSTEM_NAME MATCHES "WindowsStore" OR EMSCRIPTEN)) | 694 | if(NOT (CMAKE_SYSTEM_NAME MATCHES "WindowsStore" OR EMSCRIPTEN)) |
| 695 | set(SIGNERTEST_SRC signertest.c) | 695 | set(SIGNERTEST_SRC signertest.c) |
| 696 | check_symbol_exists(pipe2 "fcntl.h unistd.h" HAVE_PIPE2) | 696 | check_symbol_exists(pipe2 "fcntl.h;unistd.h" HAVE_PIPE2) |
| 697 | if(HAVE_PIPE2) | 697 | if(HAVE_PIPE2) |
| 698 | add_definitions(-DHAVE_PIPE2) | 698 | add_definitions(-DHAVE_PIPE2) |
| 699 | else() | 699 | else() |
| @@ -809,7 +809,7 @@ add_platform_test(tlslegacytest tlslegacytest) | |||
| 809 | # Emscripten does not support socketpair syscall. | 809 | # Emscripten does not support socketpair syscall. |
| 810 | if(NOT (CMAKE_SYSTEM_NAME MATCHES "WindowsStore" OR EMSCRIPTEN)) | 810 | if(NOT (CMAKE_SYSTEM_NAME MATCHES "WindowsStore" OR EMSCRIPTEN)) |
| 811 | set(TLSTEST_SRC tlstest.c) | 811 | set(TLSTEST_SRC tlstest.c) |
| 812 | check_symbol_exists(pipe2 "fcntl.h unistd.h" HAVE_PIPE2) | 812 | check_symbol_exists(pipe2 "fcntl.h;unistd.h" HAVE_PIPE2) |
| 813 | if(HAVE_PIPE2) | 813 | if(HAVE_PIPE2) |
| 814 | add_definitions(-DHAVE_PIPE2) | 814 | add_definitions(-DHAVE_PIPE2) |
| 815 | else() | 815 | else() |
