diff options
| author | Matt Corallo <matt@bluematt.me> | 2011-10-24 15:27:54 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-10-25 11:54:46 -0400 |
| commit | 472bbb750c298cb73f93798c8391ddcb19b953af (patch) | |
| tree | 3094694b12418744530f82fb563cfd460a0d9102 | |
| parent | d1df5717469f0daad77208972adf84129c8ad101 (diff) | |
Update openssl to 1.0.0e.
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 10 | ||||
| -rw-r--r-- | src/makefile.linux-mingw | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 52b10bc33f..9cf9443c03 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.0e.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.0e.tar.gz + cd openssl-1.0.0e ./Configure --cross-compile-prefix=i586-mingw32msvc- mingw make cd .. @@ -77,6 +77,10 @@ script: | cp -a $OUTDIR/src/locale $OUTDIR cp $OUTDIR/src/doc/README_windows.txt $OUTDIR/readme.txt cp $OUTDIR/src/COPYING $OUTDIR/license.txt + $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.0e OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.0e/include INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease + make $MAKEOPTS + cp release/bitcoin-qt.exe $OUTDIR/ + # cd src sed 's/$(DEBUGFLAGS)/-frandom-seed=bitcoin/' -i makefile.linux-mingw export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index eb22190e57..29b433f851 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -9,13 +9,13 @@ 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.0e/include" \ -I"$(DEPSDIR)" 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.0e" LIBS= \ -l boost_system-mt-s \ |