diff options
| author | Brent Cook <bcook@openbsd.org> | 2014-12-14 16:42:47 -0600 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2014-12-14 16:59:35 -0600 |
| commit | d2342f36bcf81dbcea22bb113a5d0e9e0de505f8 (patch) | |
| tree | ad303cfe96fd708a9c761566cbbc36b6ec2a8af2 | |
| parent | 09e5a841cdfedf46be51cfebab002d4a8fb0face (diff) | |
| download | portable-d2342f36bcf81dbcea22bb113a5d0e9e0de505f8.tar.gz portable-d2342f36bcf81dbcea22bb113a5d0e9e0de505f8.tar.bz2 portable-d2342f36bcf81dbcea22bb113a5d0e9e0de505f8.zip | |
allow Windows DLLs to be built
based on a patch from Jan Engelhardt
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | crypto/Makefile.am | 2 | ||||
| -rw-r--r-- | ssl/Makefile.am | 2 | ||||
| -rw-r--r-- | tls/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 4b3d209..e56e39d 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -33,7 +33,7 @@ case $host_os in | |||
| 33 | ;; | 33 | ;; |
| 34 | *mingw*) | 34 | *mingw*) |
| 35 | HOST_OS=win | 35 | HOST_OS=win |
| 36 | CFLAGS="$CFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600 -DOPENSSL_NO_SPEED -D__USE_MINGW_ANSI_STDIO" | 36 | CFLAGS="$CFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600 -DOPENSSL_NO_SPEED -DNO_SYSLOG -D__USE_MINGW_ANSI_STDIO" |
| 37 | AC_SUBST([PLATFORM_LDADD], ['-lws2_32']) | 37 | AC_SUBST([PLATFORM_LDADD], ['-lws2_32']) |
| 38 | ;; | 38 | ;; |
| 39 | *solaris*) | 39 | *solaris*) |
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 171d662..e5a4d4d 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
| @@ -8,7 +8,7 @@ lib_LTLIBRARIES = libcrypto.la | |||
| 8 | 8 | ||
| 9 | EXTRA_DIST = VERSION | 9 | EXTRA_DIST = VERSION |
| 10 | 10 | ||
| 11 | libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ | 11 | libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined |
| 12 | libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la | 12 | libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la |
| 13 | libcrypto_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) | 13 | libcrypto_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) |
| 14 | libcrypto_la_CFLAGS += -DOPENSSL_NO_HW_PADLOCK | 14 | libcrypto_la_CFLAGS += -DOPENSSL_NO_HW_PADLOCK |
diff --git a/ssl/Makefile.am b/ssl/Makefile.am index 87aeff6..5dad39f 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am | |||
| @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libssl.la | |||
| 4 | 4 | ||
| 5 | EXTRA_DIST = VERSION | 5 | EXTRA_DIST = VERSION |
| 6 | 6 | ||
| 7 | libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ | 7 | libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined |
| 8 | libssl_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) | 8 | libssl_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) |
| 9 | libssl_la_LIBADD = ../crypto/libcrypto.la | 9 | libssl_la_LIBADD = ../crypto/libcrypto.la |
| 10 | 10 | ||
diff --git a/tls/Makefile.am b/tls/Makefile.am index 31ee861..cba2b9e 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am | |||
| @@ -5,7 +5,7 @@ lib_LTLIBRARIES = libtls.la | |||
| 5 | 5 | ||
| 6 | EXTRA_DIST = VERSION | 6 | EXTRA_DIST = VERSION |
| 7 | 7 | ||
| 8 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ | 8 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined |
| 9 | libtls_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) | 9 | libtls_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) |
| 10 | libtls_la_LIBADD = ../ssl/libssl.la | 10 | libtls_la_LIBADD = ../ssl/libssl.la |
| 11 | 11 | ||