diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-18 13:13:53 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-18 13:16:08 +0100 |
| commit | 77f1b4ae196f5cf1300ded5c5b786426918f2d8c (patch) | |
| tree | f63001cb64424957ca3d62da88c595c24db0d395 | |
| parent | 6c19ca1f92c014a9a7155e159fda592733fb1d4c (diff) | |
gitian: add optimization to win32 protobuf
When overriding CXXFLAGS, also provide optimization flags, otherwise
we're building without optimization.
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 4 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/protobuf-win32.yml | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 794fa27f1f..eac74272c5 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -25,7 +25,7 @@ files: - "qt-win32-5.2.0-gitian-r1.zip" - "boost-win32-1.55.0-gitian-r6.zip" - "bitcoin-deps-win32-gitian-r10.zip" -- "protobuf-win32-2.5.0-gitian-r3.zip" +- "protobuf-win32-2.5.0-gitian-r4.zip" script: | # STAGING=$HOME/staging @@ -37,7 +37,7 @@ script: | unzip ../build/qt-win32-5.2.0-gitian-r1.zip unzip ../build/boost-win32-1.55.0-gitian-r6.zip unzip ../build/bitcoin-deps-win32-gitian-r10.zip - unzip ../build/protobuf-win32-2.5.0-gitian-r3.zip + unzip ../build/protobuf-win32-2.5.0-gitian-r4.zip cd $HOME/build/ # cd bitcoin diff --git a/contrib/gitian-descriptors/protobuf-win32.yml b/contrib/gitian-descriptors/protobuf-win32.yml index b2e3d0b465..e93f92bbfe 100644 --- a/contrib/gitian-descriptors/protobuf-win32.yml +++ b/contrib/gitian-descriptors/protobuf-win32.yml @@ -18,6 +18,7 @@ script: | export TZ=UTC export INSTALLPREFIX=$OUTDIR/staging/deps export HOST=i686-w64-mingw32 + OPTFLAGS="-O2" # Integrity Check echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" | sha256sum -c @@ -33,12 +34,12 @@ script: | cp src/protoc $INSTALLPREFIX/host/bin # Now recompile with the mingw cross-compiler: make distclean - ./configure --prefix=$INSTALLPREFIX --enable-shared=no --disable-dependency-tracking --with-protoc=$INSTALLPREFIX/host/bin/protoc --host=$HOST CXXFLAGS=-frandom-seed=11 + ./configure --prefix=$INSTALLPREFIX --enable-shared=no --disable-dependency-tracking --with-protoc=$INSTALLPREFIX/host/bin/protoc --host=$HOST CXXFLAGS="-frandom-seed=11 ${OPTFLAGS}" make make install cd $INSTALLPREFIX export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME - zip -r $OUTDIR/protobuf-win32-2.5.0-gitian-r3.zip include lib host + zip -r $OUTDIR/protobuf-win32-2.5.0-gitian-r4.zip include lib host unset LD_PRELOAD unset FAKETIME |