aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-02-25 07:43:32 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2014-02-25 07:58:11 +0100
commit31b3d94ef5b84aee44c70f779ab5261df4784075 (patch)
tree22d11a42f2d9bb8be82466e9bfd1fdb11ea9522e
parent4fd082ded7af28929e909843eba5c801fe755257 (diff)
downloadbitcoin-31b3d94ef5b84aee44c70f779ab5261df4784075.tar.xz
gitian: Make protobuf win32 intermediate output deterministic
While building protobuf in different environments we noticed that the host tool protoc was slightly different between builds (a symbol table sorting issue). Add a deterministic seed as well as disable zlib support. Exected output is now: e2e403e1a08869c7eed4d4293bce13d51ec6a63592918b90ae215a0eceb44cb4 protobuf-win32-2.5.0-gitian-r4.zip a0999037e8b0ef9ade13efd88fee261ba401f5ca910068b7e0cd3262ba667db0 protobuf-win64-2.5.0-gitian-r4.zip No effect on final executables so no version bump.
-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