diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-05-22 10:58:13 +0900 |
---|---|---|
committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-05-22 13:31:04 +0900 |
commit | 39c7fa8ad6c737806cc76f0dd8a79105454308d2 (patch) | |
tree | 5de760e067c278d79fa77a9e09475f95eaaded75 | |
parent | 3845b1eff4d8e0cd493fff90730dfcd5499ddbaf (diff) | |
download | portable-39c7fa8ad6c737806cc76f0dd8a79105454308d2.tar.gz portable-39c7fa8ad6c737806cc76f0dd8a79105454308d2.tar.bz2 portable-39c7fa8ad6c737806cc76f0dd8a79105454308d2.zip |
Force cmake to link strtonum shim with Darwin less than 20
check_function_exists misinterprets as if strtonum exists on macos 10.15.
-rw-r--r-- | apps/nc/CMakeLists.txt | 3 | ||||
-rw-r--r-- | apps/ocspcheck/CMakeLists.txt | 3 | ||||
-rw-r--r-- | apps/openssl/CMakeLists.txt | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt index f21c869..a241637 100644 --- a/apps/nc/CMakeLists.txt +++ b/apps/nc/CMakeLists.txt | |||
@@ -30,7 +30,8 @@ else() | |||
30 | endif() | 30 | endif() |
31 | 31 | ||
32 | check_function_exists(strtonum HAVE_STRTONUM) | 32 | check_function_exists(strtonum HAVE_STRTONUM) |
33 | if(HAVE_STRTONUM) | 33 | if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND |
34 | CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20) | ||
34 | add_definitions(-DHAVE_STRTONUM) | 35 | add_definitions(-DHAVE_STRTONUM) |
35 | else() | 36 | else() |
36 | set(NC_SRC ${NC_SRC} compat/strtonum.c) | 37 | set(NC_SRC ${NC_SRC} compat/strtonum.c) |
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt index b960a81..43b091a 100644 --- a/apps/ocspcheck/CMakeLists.txt +++ b/apps/ocspcheck/CMakeLists.txt | |||
@@ -14,7 +14,8 @@ else() | |||
14 | endif() | 14 | endif() |
15 | 15 | ||
16 | check_function_exists(strtonum HAVE_STRTONUM) | 16 | check_function_exists(strtonum HAVE_STRTONUM) |
17 | if(HAVE_STRTONUM) | 17 | if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND |
18 | CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20) | ||
18 | add_definitions(-DHAVE_STRTONUM) | 19 | add_definitions(-DHAVE_STRTONUM) |
19 | else() | 20 | else() |
20 | set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c) | 21 | set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c) |
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt index b9cd222..c5cfbe2 100644 --- a/apps/openssl/CMakeLists.txt +++ b/apps/openssl/CMakeLists.txt | |||
@@ -62,7 +62,8 @@ if(WIN32) | |||
62 | endif() | 62 | endif() |
63 | 63 | ||
64 | check_function_exists(strtonum HAVE_STRTONUM) | 64 | check_function_exists(strtonum HAVE_STRTONUM) |
65 | if(HAVE_STRTONUM) | 65 | if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND |
66 | CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20) | ||
66 | add_definitions(-DHAVE_STRTONUM) | 67 | add_definitions(-DHAVE_STRTONUM) |
67 | else() | 68 | else() |
68 | set(OPENSSL_SRC ${OPENSSL_SRC} compat/strtonum.c) | 69 | set(OPENSSL_SRC ${OPENSSL_SRC} compat/strtonum.c) |