From 5ad4028050d54be1bf60b99dc4edaa2a984f959b Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Fri, 27 Apr 2012 10:52:14 -0400 Subject: [PATCH] Windows build: compile against openssl 1.0.1b --- contrib/gitian-descriptors/gitian-win32.yml | 6 +++--- doc/build-msw.txt | 6 +++--- src/makefile.linux-mingw | 4 ++-- src/makefile.mingw | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 252e62e..f1990aa 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -18,7 +18,7 @@ remotes: files: - "wxwidgets-win32-2.9.2-gitian.zip" - "boost-win32-1.47.0-gitian.zip" -- "openssl-1.0.0d.tar.gz" +- "openssl-1.0.1b.tar.gz" - "db-4.8.30.NC.tar.gz" - "miniupnpc-1.6.tar.gz" script: | @@ -50,8 +50,8 @@ script: | mv include/boost . cd .. # - tar xzf openssl-1.0.0d.tar.gz - cd openssl-1.0.0d + tar xzf openssl-1.0.1b.tar.gz + cd openssl-1.0.1b ./Configure --cross-compile-prefix=i586-mingw32msvc- mingw make cd .. diff --git a/doc/build-msw.txt b/doc/build-msw.txt index d08e3a2..69c298b 100644 --- a/doc/build-msw.txt +++ b/doc/build-msw.txt @@ -28,7 +28,7 @@ Libraries you need to download separately and build: default path download wxWidgets \wxwidgets-2.9.2-mgw http://www.wxwidgets.org/downloads/ -OpenSSL \openssl-1.0.0d-mgw http://www.openssl.org/source/ +OpenSSL \openssl-1.0.1b-mgw http://www.openssl.org/source/ Berkeley DB \db-4.8.30.NC-mgw http://www.oracle.com/technology/software/products/berkeley-db/index.html Boost \boost-1.47.0-mgw http://www.boost.org/users/download/ miniupnpc \miniupnpc-1.6-mgw http://miniupnp.tuxfamily.org/files/ @@ -42,7 +42,7 @@ miniupnpc New (3-clause) BSD license Versions used in this release: wxWidgets 2.9.2 -OpenSSL 1.0.0d +OpenSSL 1.0.1b Berkeley DB 4.8.30.NC Boost 1.47.0 miniupnpc 1.6 @@ -66,7 +66,7 @@ MSYS shell: un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377) change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe' -cd /c/openssl-1.0.0d-mgw +cd /c/openssl-1.0.1b-mgw ./config make diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 23b417c..945c15e 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -9,7 +9,7 @@ USE_UPNP:=0 INCLUDEPATHS= \ -I"$(DEPSDIR)/boost_1_47_0" \ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ - -I"$(DEPSDIR)/openssl-1.0.0d/include" \ + -I"$(DEPSDIR)/openssl-1.0.1b/include" \ -I"$(DEPSDIR)/wxWidgets-2.9.2/lib/gcc_lib/mswud" \ -I"$(DEPSDIR)/wxWidgets-2.9.2/include" \ -I"$(DEPSDIR)/wxWidgets-2.9.2/lib/wx/include/i586-mingw32msvc-msw-unicode-static-2.9/" \ @@ -18,7 +18,7 @@ INCLUDEPATHS= \ LIBPATHS= \ -L"$(DEPSDIR)/boost_1_47_0/stage/lib" \ -L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ - -L"$(DEPSDIR)/openssl-1.0.0d" \ + -L"$(DEPSDIR)/openssl-1.0.1b" \ -L"$(DEPSDIR)/wxWidgets-2.9.2/lib" WXLIBS= -l wx_mswu-2.9-i586-mingw32msvc diff --git a/src/makefile.mingw b/src/makefile.mingw index ef7eebf..35254b3 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -7,14 +7,14 @@ USE_UPNP:=0 INCLUDEPATHS= \ -I"C:\boost-1.47.0-mgw" \ -I"C:\db-4.8.30.NC-mgw\build_unix" \ - -I"C:\openssl-1.0.0d-mgw\include" \ + -I"C:\openssl-1.0.1b-mgw\include" \ -I"C:\wxWidgets-2.9.2-mgw\lib\gcc_lib\mswud" \ -I"C:\wxWidgets-2.9.2-mgw\include" LIBPATHS= \ -L"C:\boost-1.47.0-mgw\stage\lib" \ -L"C:\db-4.8.30.NC-mgw\build_unix" \ - -L"C:\openssl-1.0.0d-mgw" \ + -L"C:\openssl-1.0.1b-mgw" \ -L"C:\wxWidgets-2.9.2-mgw\lib\gcc_lib" WXLIBS= \ -- 1.7.1