diff options
| author | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-12-26 15:42:47 +0900 |
|---|---|---|
| committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-12-26 16:00:25 +0900 |
| commit | adde656bb7a859fb4cc334cb89a00840a7023c2e (patch) | |
| tree | f366c790f1e3afc3782b7f5224a823b2c9b8993b /apps/openssl | |
| parent | 1b95c5d584c5db4f08160299f5bf66acf654875d (diff) | |
| download | portable-adde656bb7a859fb4cc334cb89a00840a7023c2e.tar.gz portable-adde656bb7a859fb4cc334cb89a00840a7023c2e.tar.bz2 portable-adde656bb7a859fb4cc334cb89a00840a7023c2e.zip | |
Add strtonum to compat library and export it
crypto library requires strtonum now, and add it to compat library.
remove it from applications compat/ directories.
Diffstat (limited to 'apps/openssl')
| -rw-r--r-- | apps/openssl/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | apps/openssl/Makefile.am | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt index bb058e1..2a84178 100644 --- a/apps/openssl/CMakeLists.txt +++ b/apps/openssl/CMakeLists.txt | |||
| @@ -61,14 +61,6 @@ if(WIN32) | |||
| 61 | set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c) | 61 | set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c) |
| 62 | endif() | 62 | endif() |
| 63 | 63 | ||
| 64 | check_function_exists(strtonum HAVE_STRTONUM) | ||
| 65 | if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND | ||
| 66 | CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20) | ||
| 67 | add_definitions(-DHAVE_STRTONUM) | ||
| 68 | else() | ||
| 69 | set(OPENSSL_SRC ${OPENSSL_SRC} compat/strtonum.c) | ||
| 70 | endif() | ||
| 71 | |||
| 72 | if(CMAKE_SYSTEM_NAME MATCHES "Darwin") | 64 | if(CMAKE_SYSTEM_NAME MATCHES "Darwin") |
| 73 | check_function_exists(clock_gettime HAVE_CLOCK_GETTIME) | 65 | check_function_exists(clock_gettime HAVE_CLOCK_GETTIME) |
| 74 | if(NOT HAVE_CLOCK_GETTIME) | 66 | if(NOT HAVE_CLOCK_GETTIME) |
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am index b98e08d..7cbac48 100644 --- a/apps/openssl/Makefile.am +++ b/apps/openssl/Makefile.am | |||
| @@ -84,10 +84,6 @@ openssl_SOURCES += compat/clock_gettime_osx.c | |||
| 84 | endif | 84 | endif |
| 85 | endif | 85 | endif |
| 86 | 86 | ||
| 87 | if !HAVE_STRTONUM | ||
| 88 | openssl_SOURCES += compat/strtonum.c | ||
| 89 | endif | ||
| 90 | |||
| 91 | noinst_HEADERS = apps.h | 87 | noinst_HEADERS = apps.h |
| 92 | noinst_HEADERS += progs.h | 88 | noinst_HEADERS += progs.h |
| 93 | noinst_HEADERS += s_apps.h | 89 | noinst_HEADERS += s_apps.h |
