diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-22 16:24:35 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-22 16:24:43 +0200 |
| commit | bbe53f61db73237b8334207d696d99a4cf16a760 (patch) | |
| tree | a6be54d8bcf25498be3db50aa2985508c7910c50 /contrib | |
| parent | 91c601c54a097e467204285a728006a2b3c78eec (diff) | |
| parent | 05c20a553a12d03b1512a75973674c6d25534259 (diff) | |
| download | bitcoin-bbe53f61db73237b8334207d696d99a4cf16a760.tar.xz | |
Merge pull request #4042
05c20a5 build: add symbol for upcoming gcc 4.9's libstdc++ (Cory Fields)
49a3352 gitian-linux: --enable-glibc-back-compat (Warren Togami)
d5aab70 build: add an option for enabling glibc back-compat (Cory Fields)
ffc6b67 build: add glibc/libstdc++ back-compat stubs (Cory Fields)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-descriptors/gitian-linux.yml | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 018b6fb26f..1747f531ea 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -41,7 +41,7 @@ script: | cd ../build function do_configure { - ./configure "$@" --enable-upnp-default --prefix=$STAGING --with-protoc-bindir=$STAGING/host/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 ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt" + ./configure "$@" --enable-upnp-default --prefix=$STAGING --with-protoc-bindir=$STAGING/host/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 ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt" --enable-glibc-back-compat } # cd bitcoin @@ -60,19 +60,6 @@ script: | make $MAKEOPTS install-strip make $MAKEOPTS clean - # Build fully static versions of bitcoind and bitcoin-cli for older Linux distros - STATIC_BINDIR="$HOME/bindir.static" - mkdir -p $STATIC_BINDIR - # For 32-bit, -pie cannot be used with -static, as invalid executables are generated - # For 64-bit, -pie with -static causes a link error - # Disable hardening in configure and manually pass 'static-safe' hardening flags - OPTFLAGS='-O2 -static -Wstack-protector -fstack-protector-all -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now' - do_configure --bindir=$STATIC_BINDIR --disable-tests --enable-upnp-default --without-gui --disable-hardening - make $MAKEOPTS - make $MAKEOPTS install-strip - cp $STATIC_BINDIR/bitcoind $BINDIR/bitcoind.static - cp $STATIC_BINDIR/bitcoin-cli $BINDIR/bitcoin-cli.static - # sort distribution tar file and normalize user/group/mtime information for deterministic output mkdir -p $OUTDIR/src rm -rf $TEMPDIR |