From: Wouter Wijngaards Date: Mon, 22 Sep 2014 12:20:20 +0000 (+0000) Subject: - Fix for mingw compile with openssl-1.0.1i. X-Git-Tag: release-1.5.0rc1~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d56d11ff552429f8b2de866bf8f8051f897fb292;p=thirdparty%2Funbound.git - 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 3944d29e7..629a819e3 100644 --- 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 6f8b474ae..dd931aac5 100755 --- 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.