Browse Source

Bugfix: Replace bashisms with standard sh in gitian descriptors

pull/1/head
Luke Dashjr 8 years ago
parent
commit
ab72068565
  1. 2
      contrib/gitian-descriptors/boost-win.yml
  2. 4
      contrib/gitian-descriptors/deps-win.yml
  3. 4
      contrib/gitian-descriptors/gitian-win.yml
  4. 2
      contrib/gitian-descriptors/protobuf-win.yml
  5. 4
      contrib/gitian-descriptors/qt-linux.yml
  6. 2
      contrib/gitian-descriptors/qt-win.yml
  7. 4
      depends/config.site.in

2
contrib/gitian-descriptors/boost-win.yml

@ -29,7 +29,7 @@ script: | @@ -29,7 +29,7 @@ script: |
#
INSTALLPREFIX=$HOME/staging${BITS}
BUILDDIR=$HOME/build${BITS}
if [ "$BITS" == "32" ]; then
if [ "x$BITS" = "x32" ]; then
HOST=i686-w64-mingw32
else
HOST=x86_64-w64-mingw32

4
contrib/gitian-descriptors/deps-win.yml

@ -39,7 +39,7 @@ script: | @@ -39,7 +39,7 @@ script: |
#
INSTALLPREFIX=$HOME/staging${BITS}
BUILDDIR=$HOME/build${BITS}
if [ "$BITS" == "32" ]; then
if [ "x$BITS" = "x32" ]; then
HOST=i686-w64-mingw32
else
HOST=x86_64-w64-mingw32
@ -50,7 +50,7 @@ script: | @@ -50,7 +50,7 @@ script: |
#
tar xzf $INDIR/openssl-1.0.1h.tar.gz
cd openssl-1.0.1h
if [ "$BITS" == "32" ]; then
if [ "x$BITS" = "x32" ]; then
OPENSSL_TGT=mingw
else
OPENSSL_TGT=mingw64

4
contrib/gitian-descriptors/gitian-win.yml

@ -50,7 +50,7 @@ script: | @@ -50,7 +50,7 @@ script: |
STAGING=$HOME/staging${BITS}
BUILDDIR=$HOME/build${BITS}
BINDIR=$OUTDIR/$BITS
if [ "$BITS" == "32" ]; then
if [ "x$BITS" = "x32" ]; then
HOST=i686-w64-mingw32
else
HOST=x86_64-w64-mingw32
@ -63,7 +63,7 @@ script: | @@ -63,7 +63,7 @@ script: |
unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip
unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r13.zip
unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip
if [ "$NEEDDIST" == "1" ]; then
if [ "x$NEEDDIST" = "x1" ]; then
# Make source code archive which is architecture independent so it only needs to be done once
cd $HOME/build/bitcoin
./autogen.sh

2
contrib/gitian-descriptors/protobuf-win.yml

@ -26,7 +26,7 @@ script: | @@ -26,7 +26,7 @@ script: |
#
INSTALLPREFIX=$HOME/staging${BITS}
BUILDDIR=$HOME/build${BITS}
if [ "$BITS" == "32" ]; then
if [ "x$BITS" = "x32" ]; then
HOST=i686-w64-mingw32
else
HOST=x86_64-w64-mingw32

4
contrib/gitian-descriptors/qt-linux.yml

@ -18,7 +18,7 @@ files: @@ -18,7 +18,7 @@ files:
script: |
export FAKETIME=$REFERENCE_DATETIME
export TZ=UTC
if [ "$GBUILD_BITS" == "32" ]; then
if [ "x$GBUILD_BITS" = "x32" ]; then
ARCH='i386-linux-gnu'
else
ARCH='x86_64-linux-gnu'
@ -74,7 +74,7 @@ script: | @@ -74,7 +74,7 @@ script: |
#endif
' > $QCONFIG
if [ "$GBUILD_BITS" == "32" ]; then
if [ "x$GBUILD_BITS" = "x32" ]; then
echo '
/* Machine byte-order */
#define Q_BIG_ENDIAN 4321

2
contrib/gitian-descriptors/qt-win.yml

@ -38,7 +38,7 @@ script: | @@ -38,7 +38,7 @@ script: |
INSTALLPREFIX=$HOME/staging${BITS}
BUILDDIR=$HOME/build${BITS}
DEPSDIR=$HOME/deps${BITS}
if [ "$BITS" == "32" ]; then
if [ "x$BITS" = "x32" ]; then
HOST=i686-w64-mingw32
else
HOST=x86_64-w64-mingw32

4
depends/config.site.in

@ -34,12 +34,12 @@ if test -z $with_gui && test -n "@no_qt@"; then @@ -34,12 +34,12 @@ if test -z $with_gui && test -n "@no_qt@"; then
with_gui=no
fi
if test @host_os@ == darwin; then
if test x@host_os@ = xdarwin; then
BREW=no
PORT=no
fi
if test @host_os@ == mingw32; then
if test x@host_os@ = xmingw32; then
if test -z $with_qt_incdir; then
with_qt_incdir=$prefix/include
fi

Loading…
Cancel
Save