- Fix for mingw compile with openssl-1.0.1i.

git-svn-id: file:///svn/unbound/trunk@3228 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 3944d29e7ff874d5eaaea65f1aa89e3328ab8bc4..629a819e3eda5d78d11ab111b6543f429cee9764 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 22 September 2014: Wouter
        - Fix swig and python examples for Python 3.x.
+       - Fix for mingw compile with openssl-1.0.1i.
 
 19 September 2014: Wouter
        - improve python configuration detection to build on Fedora 22.

diff --git a/makedist.sh b/makedist.sh
index 6f8b474aeaf0ab931e3448f5cbae68ade68412d1..dd931aac56b2c2ab25e1c8290dd74d7c6f4218ed 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -203,9 +203,10 @@ if [ "$DOWIN" = "yes" ]; then
                cd openssl-* || error_cleanup "no openssl-X dir in tarball"
                # configure for crosscompile, without CAPI because it fails
                # cross-compilation and it is not used anyway
-               sslflags="no-asm --cross-compile-prefix=i686-w64-mingw32- -DOPENSSL_NO_CAPIENG mingw"
+               # before 1.0.1i need --cross-compile-prefix=i686-w64-mingw32-
+               sslflags="no-asm -DOPENSSL_NO_CAPIENG mingw"
                info "winssl: Configure $sslflags"
-               ./Configure --prefix="$sslinstall" $sslflags || error_cleanup "OpenSSL Configure failed"
+               CC=i686-w64-mingw32-gcc ./Configure --prefix="$sslinstall" $sslflags || error_cleanup "OpenSSL Configure failed"
                info "winssl: make"
                make || error_cleanup "OpenSSL crosscompile failed"
                # only install sw not docs, which take a long time.