aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2014-02-25 11:34:45 -0500
committerGavin Andresen <gavinandresen@gmail.com>2014-02-25 11:34:45 -0500
commit34b9ea7db1831a1c9bde58222f7cd53053e784c4 (patch)
tree00a2db28e62f0e934c5ab9bac69250ea529a1d51
parent12f5787d4545aa4ea8b7b58dc21319d574023b1f (diff)
parent31b3d94ef5b84aee44c70f779ab5261df4784075 (diff)
downloadbitcoin-34b9ea7db1831a1c9bde58222f7cd53053e784c4.tar.xz
Merge pull request #3742 from laanwj/2014_02_win32_protobuf_determinism
gitian: Make protobuf win32 intermediate output deterministic
-rw-r--r--contrib/gitian-descriptors/protobuf-win.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/gitian-descriptors/protobuf-win.yml b/contrib/gitian-descriptors/protobuf-win.yml
index 543f20b394..d2fdcaa7f2 100644
--- a/contrib/gitian-descriptors/protobuf-win.yml
+++ b/contrib/gitian-descriptors/protobuf-win.yml
@@ -38,13 +38,13 @@ script: |
tar xjf $INDIR/protobuf-2.5.0.tar.bz2
cd protobuf-2.5.0
# First: build a native (linux) protoc
- ./configure --enable-shared=no --disable-dependency-tracking
+ ./configure --enable-shared=no --disable-dependency-tracking --without-zlib CXXFLAGS="-frandom-seed=11 ${OPTFLAGS}"
make
mkdir -p $INSTALLPREFIX/host/bin
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 ${OPTFLAGS}"
+ ./configure --prefix=$INSTALLPREFIX --enable-shared=no --disable-dependency-tracking --without-zlib --with-protoc=$INSTALLPREFIX/host/bin/protoc --host=$HOST CXXFLAGS="-frandom-seed=11 ${OPTFLAGS}"
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME
make