diff options
| author | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-05-29 02:06:59 +0000 |
|---|---|---|
| committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-05-30 01:11:45 +0000 |
| commit | 420723ee1818e1b62300f845f7af6a1a0cba6398 (patch) | |
| tree | 4ae8a8e06aa5556d51565bb7dd416753b55459ef | |
| parent | 31ef9ade60a19d369efc81528283d0c8735637cc (diff) | |
| download | portable-420723ee1818e1b62300f845f7af6a1a0cba6398.tar.gz portable-420723ee1818e1b62300f845f7af6a1a0cba6398.tar.bz2 portable-420723ee1818e1b62300f845f7af6a1a0cba6398.zip | |
Fix mingw build on ubuntu 20.04
- Link libssp to resolve undefined reference __memcpy_chk
- Disable dtlstest since mingw does not have poll
| -rw-r--r-- | m4/check-os-options.m4 | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 index 644bf71..9343bc2 100644 --- a/m4/check-os-options.m4 +++ b/m4/check-os-options.m4 | |||
| @@ -112,7 +112,7 @@ char buf[1]; getentropy(buf, 1); | |||
| 112 | CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" | 112 | CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" |
| 113 | CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" | 113 | CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" |
| 114 | CPPFLAGS="$CPPFLAGS" | 114 | CPPFLAGS="$CPPFLAGS" |
| 115 | AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt']) | 115 | AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt -lssp']) |
| 116 | ;; | 116 | ;; |
| 117 | *solaris*) | 117 | *solaris*) |
| 118 | HOST_OS=solaris | 118 | HOST_OS=solaris |
diff --git a/tests/Makefile.am b/tests/Makefile.am index 8ce338f..f43bd85 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
| @@ -172,9 +172,11 @@ check_PROGRAMS += dsatest | |||
| 172 | dsatest_SOURCES = dsatest.c | 172 | dsatest_SOURCES = dsatest.c |
| 173 | 173 | ||
| 174 | # dtlstest | 174 | # dtlstest |
| 175 | if !HOST_WIN | ||
| 175 | TESTS += dtlstest.sh | 176 | TESTS += dtlstest.sh |
| 176 | check_PROGRAMS += dtlstest | 177 | check_PROGRAMS += dtlstest |
| 177 | dtlstest_SOURCES = dtlstest.c | 178 | dtlstest_SOURCES = dtlstest.c |
| 179 | endif | ||
| 178 | EXTRA_DIST += dtlstest.sh | 180 | EXTRA_DIST += dtlstest.sh |
| 179 | 181 | ||
| 180 | # ec_point_conversion | 182 | # ec_point_conversion |
