Merge pull request #3014 from theuni/gitian-fixups

Gitian fixups
This commit is contained in:
Gavin Andresen 2013-09-18 16:05:05 -07:00
commit 69b16a11a2
3 changed files with 8 additions and 8 deletions

View File

@ -39,7 +39,7 @@ script: |
# #
tar xzf db-4.8.30.NC.tar.gz tar xzf db-4.8.30.NC.tar.gz
cd db-4.8.30.NC/build_unix cd db-4.8.30.NC/build_unix
../dist/configure --prefix=$INSTALLPREFIX --enable-mingw --enable-cxx --host=$HOST ../dist/configure --prefix=$INSTALLPREFIX --enable-mingw --enable-cxx --host=$HOST --disable-shared
make $MAKEOPTS library_build make $MAKEOPTS library_build
make install_lib install_include make install_lib install_include
cd ../.. cd ../..
@ -77,6 +77,6 @@ script: |
cd .. cd ..
# #
cd $INSTALLPREFIX cd $INSTALLPREFIX
zip -r $OUTDIR/bitcoin-deps-0.0.6.zip include lib zip -r $OUTDIR/bitcoin-deps-0.0.7.zip include lib
# Kill wine processes as gitian won't figure out we are done otherwise # Kill wine processes as gitian won't figure out we are done otherwise
killall wineserver services.exe explorer.exe winedevice.exe killall wineserver services.exe explorer.exe winedevice.exe

View File

@ -23,7 +23,7 @@ remotes:
files: files:
- "qt-win32-4.8.3-gitian-r3.zip" - "qt-win32-4.8.3-gitian-r3.zip"
- "boost-win32-1.50.0-gitian3.zip" - "boost-win32-1.50.0-gitian3.zip"
- "bitcoin-deps-0.0.6.zip" - "bitcoin-deps-0.0.7.zip"
- "protobuf-win32-2.5.0-gitian-r2.zip" - "protobuf-win32-2.5.0-gitian-r2.zip"
script: | script: |
# #
@ -32,7 +32,7 @@ script: |
cd $STAGING cd $STAGING
unzip ../build/qt-win32-4.8.3-gitian-r3.zip unzip ../build/qt-win32-4.8.3-gitian-r3.zip
unzip ../build/boost-win32-1.50.0-gitian3.zip unzip ../build/boost-win32-1.50.0-gitian3.zip
unzip ../build/bitcoin-deps-0.0.6.zip unzip ../build/bitcoin-deps-0.0.7.zip
unzip ../build/protobuf-win32-2.5.0-gitian-r2.zip unzip ../build/protobuf-win32-2.5.0-gitian-r2.zip
cd $HOME/build/ cd $HOME/build/
# #
@ -40,12 +40,12 @@ script: |
export PATH=$STAGING/host/bin:$PATH export PATH=$STAGING/host/bin:$PATH
export TAR_OPTIONS=--mtime=`echo $REFERENCE_DATETIME | awk '{ print $1 }'` export TAR_OPTIONS=--mtime=`echo $REFERENCE_DATETIME | awk '{ print $1 }'`
./autogen.sh ./autogen.sh
./configure --disable-debug --bindir=$OUTDIR --prefix=$STAGING --host=i586-mingw32msvc --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin" ./configure --bindir=$OUTDIR --prefix=$STAGING --host=i586-mingw32msvc --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin"
make dist make dist
mkdir -p distsrc mkdir -p distsrc
cd distsrc cd distsrc
tar --strip-components=1 -xf ../bitcoin-*.tar.* tar --strip-components=1 -xf ../bitcoin-*.tar.*
./configure --disable-debug --bindir=$OUTDIR --prefix=$STAGING --host=i586-mingw32msvc --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin" ./configure --bindir=$OUTDIR --prefix=$STAGING --host=i586-mingw32msvc --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin"
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME export FAKETIME=$REFERENCE_DATETIME
export TZ=UTC export TZ=UTC

View File

@ -58,12 +58,12 @@ script: |
cd bitcoin cd bitcoin
export TAR_OPTIONS=--mtime=`echo $REFERENCE_DATETIME | awk '{ print $1 }'` export TAR_OPTIONS=--mtime=`echo $REFERENCE_DATETIME | awk '{ print $1 }'`
./autogen.sh ./autogen.sh
./configure --disable-debug --prefix=$STAGING --bindir=$OUTDIR --with-protoc-bindir=$STAGING/host/bin --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin" ./configure --prefix=$STAGING --bindir=$OUTDIR --with-protoc-bindir=$STAGING/host/bin --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin"
make dist make dist
mkdir -p distsrc mkdir -p distsrc
cd distsrc cd distsrc
tar --strip-components=1 -xf ../bitcoin-*.tar.* tar --strip-components=1 -xf ../bitcoin-*.tar.*
./configure --disable-debug --prefix=$STAGING --bindir=$OUTDIR --with-protoc-bindir=$STAGING/host/bin --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin" ./configure --prefix=$STAGING --bindir=$OUTDIR --with-protoc-bindir=$STAGING/host/bin --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin"
make $MAKEOPTS make $MAKEOPTS
make $MAKEOPTS install-strip make $MAKEOPTS install-strip
mkdir -p $OUTDIR/src mkdir -p $OUTDIR/src