From 420723ee1818e1b62300f845f7af6a1a0cba6398 Mon Sep 17 00:00:00 2001 From: kinichiro Date: Sat, 29 May 2021 02:06:59 +0000 Subject: Fix mingw build on ubuntu 20.04 - Link libssp to resolve undefined reference __memcpy_chk - Disable dtlstest since mingw does not have poll --- m4/check-os-options.m4 | 2 +- tests/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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); CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" CPPFLAGS="$CPPFLAGS" - AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt']) + AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt -lssp']) ;; *solaris*) 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 dsatest_SOURCES = dsatest.c # dtlstest +if !HOST_WIN TESTS += dtlstest.sh check_PROGRAMS += dtlstest dtlstest_SOURCES = dtlstest.c +endif EXTRA_DIST += dtlstest.sh # ec_point_conversion -- cgit v1.2.3-55-g6feb From e07b5feba5103e662016158a2d77ca6bf1db12fb Mon Sep 17 00:00:00 2001 From: kinichiro Date: Sun, 30 May 2021 04:52:23 +0000 Subject: Remove -D_FORTIFY_SOURCE=2 and -lssp with mingw build --- m4/check-hardening-options.m4 | 4 +++- m4/check-os-options.m4 | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/m4/check-hardening-options.m4 b/m4/check-hardening-options.m4 index 869f00b..c8ab12e 100644 --- a/m4/check-hardening-options.m4 +++ b/m4/check-hardening-options.m4 @@ -73,7 +73,9 @@ AC_DEFUN([CHECK_C_HARDENING_OPTIONS], [ CHECK_CFLAG([[-fno-strict-overflow]]) # _FORTIFY_SOURCE replaces builtin functions with safer versions. - AX_ADD_FORTIFY_SOURCE + AS_IF([test "x$HOST_OS" != "xwin"], [ + AX_ADD_FORTIFY_SOURCE + ]) # Enable read only relocations CHECK_LDFLAG([[-Wl,-z,relro]]) diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 index 9343bc2..644bf71 100644 --- a/m4/check-os-options.m4 +++ b/m4/check-os-options.m4 @@ -112,7 +112,7 @@ char buf[1]; getentropy(buf, 1); CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" CPPFLAGS="$CPPFLAGS" - AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt -lssp']) + AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt']) ;; *solaris*) HOST_OS=solaris -- cgit v1.2.3-55-g6feb