diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-23 06:11:37 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-23 06:24:49 +0200 |
| commit | d5a3fd10e50ea8b2a43e307ed1f52d286663e551 (patch) | |
| tree | 765a43b2cb7b9af49013bcf2807abc821e18c879 /contrib | |
| parent | afa71fb3e37c729fa18ab161e0f3c930976e26e2 (diff) | |
| parent | a7ec027311ae4b14d3ea4225a875caa5a83151bb (diff) | |
| download | bitcoin-d5a3fd10e50ea8b2a43e307ed1f52d286663e551.tar.xz | |
Merge pull request #4571
a7ec027 gitian: remove unneeded option after last commit (Cory Fields)
460b32d build: fix broken boost chrono check on some platforms (Cory Fields)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-descriptors/gitian-linux.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 65a6c3c1e9..30b0227bdd 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -59,7 +59,7 @@ script: | local: *; };' > $LINKER_SCRIPT function do_configure { - ./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 + ./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}" --enable-glibc-back-compat } # cd bitcoin |