From e8ef2477a9495a1b105e6cdae38497f13ee11d20 Mon Sep 17 00:00:00 2001 From: wlc- Date: Thu, 18 Sep 2014 02:06:44 +0200 Subject: [PATCH] Fix for gitian builds --- contrib/gitian-descriptors/gitian-linux.yml | 15 ++++++++------- .../gitian-descriptors/gitian-osx-bitcoin.yml | 10 +++++----- contrib/gitian-descriptors/gitian-win.yml | 18 +++++++++--------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 65a6c3c1..9ce53246 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin" +name: "myriadcoin" suites: - "precise" architectures: @@ -22,8 +22,8 @@ packages: - "libqt4-test" reference_datetime: "2013-06-01 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/myriadcoin/myriadcoin.git" + "dir": "myriadcoin" files: - "bitcoin-deps-linux32-gitian-r6.zip" - "bitcoin-deps-linux64-gitian-r6.zip" @@ -33,7 +33,8 @@ files: - "qt-linux64-4.6.4-gitian-r1.tar.gz" script: | STAGING="$HOME/install" - OPTFLAGS='-O2' + INDIR=$HOME/build + OPTFLAGS='-O2 -msse2' BINDIR="${OUTDIR}/bin/${GBUILD_BITS}" # 32/64 bit build specific output directory TEMPDIR="$HOME/tempdir" export TZ=UTC @@ -62,11 +63,11 @@ script: | ./configure "$@" --enable-upnp-default --prefix=$STAGING --with-protoc-bindir=$STAGING/host/bin --with-qt-bindir=$STAGING/bin --with-boost=$STAGING --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib -Wl,--version-script=$LINKER_SCRIPT ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt" --enable-glibc-back-compat } # - cd bitcoin + cd myriadcoin ./autogen.sh do_configure make dist - DISTNAME=`echo bitcoin-*.tar.gz` + DISTNAME=`echo myriadcoin-*.tar.gz` # Build dynamic versions of everything # (with static linking to boost and openssl as well a some non-OS deps) @@ -83,4 +84,4 @@ script: | rm -rf $TEMPDIR mkdir -p $TEMPDIR cd $TEMPDIR - tar -xvf $HOME/build/bitcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME + tar -xvf $HOME/build/myriadcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME diff --git a/contrib/gitian-descriptors/gitian-osx-bitcoin.yml b/contrib/gitian-descriptors/gitian-osx-bitcoin.yml index 44b5de9b..e67f2b5e 100644 --- a/contrib/gitian-descriptors/gitian-osx-bitcoin.yml +++ b/contrib/gitian-descriptors/gitian-osx-bitcoin.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin" +name: "myriadcoin" suites: - "precise" architectures: @@ -14,8 +14,8 @@ packages: reference_datetime: "2013-06-01 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/myriadcoin/myriadcoin.git" + "dir": "myriadcoin" files: - "osx-native-depends-r3.tar.gz" - "osx-depends-r4.tar.gz" @@ -41,7 +41,7 @@ script: | tar -C osx-cross-depends -xf osx-depends-qt-5.2.1-r4.tar.gz export PATH=`pwd`/osx-cross-depends/native-prefix/bin:$PATH - cd bitcoin + cd myriadcoin export ZERO_AR_DATE=1 export QT_RCC_TEST=1 @@ -57,4 +57,4 @@ script: | export FAKETIME=$REFERENCE_DATETIME export TZ=UTC make deploy - dmg dmg Bitcoin-Qt.dmg $OUTDIR/Bitcoin-Qt.dmg + dmg dmg Myriadcoin-Qt.dmg $OUTDIR/Myriadcoin-Qt.dmg diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 245f15cc..931158ce 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin" +name: "myriadcoin" suites: - "precise" architectures: @@ -19,8 +19,8 @@ packages: reference_datetime: "2013-06-01 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/myriadcoin/myriadcoin.git" + "dir": "myriadcoin" files: - "qt-win32-5.2.0-gitian-r3.zip" - "qt-win64-5.2.0-gitian-r3.zip" @@ -34,7 +34,7 @@ script: | # Defines export TZ=UTC INDIR=$HOME/build - OPTFLAGS='-O2' + OPTFLAGS='-O2 -msse2' TEMPDIR="$HOME/tempdir" NEEDDIST=1 # Qt: workaround for determinism in resource ordering @@ -65,25 +65,25 @@ script: | unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip if [ "$NEEDDIST" == "1" ]; then # Make source code archive which is architecture independent so it only needs to be done once - cd $HOME/build/bitcoin + cd $HOME/build/myriadcoin ./autogen.sh ./configure --bindir=$OUTDIR --prefix=$STAGING --host=$HOST --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 ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" make dist - DISTNAME=`echo bitcoin-*.tar.gz` + DISTNAME=`echo myriadcoin-*.tar.gz` NEEDDIST=0 fi # Build platform-dependent executables from source archive cd $BUILDDIR mkdir -p distsrc cd distsrc - tar --strip-components=1 -xf $HOME/build/bitcoin/$DISTNAME + tar --strip-components=1 -xf $HOME/build/myriadcoin/$DISTNAME ./configure --enable-upnp-default --bindir=$BINDIR --prefix=$STAGING --host=$HOST --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 ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME make $MAKEOPTS make deploy make install-strip - cp -f bitcoin-*setup*.exe $BINDIR/ + cp -f myriadcoin-*setup*.exe $BINDIR/ unset LD_PRELOAD unset FAKETIME done # for BITS in @@ -93,5 +93,5 @@ script: | rm -rf $TEMPDIR mkdir -p $TEMPDIR cd $TEMPDIR - tar -xvf $HOME/build/bitcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME + tar -xvf $HOME/build/myriadcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME