diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-07-21 17:34:08 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-07-22 09:21:09 -0400 |
| commit | 460b32d7b1a2014dd490b15a360d062847f8efe9 (patch) | |
| tree | 617dbfe1bc59d615266e1d06ba61bfc47dd74ac1 | |
| parent | afa71fb3e37c729fa18ab161e0f3c930976e26e2 (diff) | |
| download | bitcoin-460b32d7b1a2014dd490b15a360d062847f8efe9.tar.xz | |
build: fix broken boost chrono check on some platforms
If clock_gettime is implemented outside of libc (librt in this case), configure
would fail when testing boost. Since clock_gettime is not present on all OSs,
boost only uses it when it can. Check for it in librt and add it to LIBS if
found, but don't fail if it's not (since boost won't be expecting it in this
case).
Also, reverse the link order as necessary for static libs.
Note that it's possible that there are other similar cases for boost, which may
be handled the same way.
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index cedc34e520..719b06da67 100644 --- a/configure.ac +++ b/configure.ac @@ -392,6 +392,8 @@ AC_TRY_COMPILE([#include <sys/socket.h>], [ AC_MSG_RESULT(no)] ) +AC_SEARCH_LIBS([clock_gettime],[rt]) + LEVELDB_CPPFLAGS= LIBLEVELDB= LIBMEMENV= @@ -460,11 +462,8 @@ dnl after 1.56. dnl If neither is available, abort. dnl If sleep_for is used, boost_chrono becomes a requirement. if test x$ax_cv_boost_chrono = xyes; then -dnl Allow passing extra needed dependency libraries for boost-chrono from static gitian build -BOOST_CHRONO_LIB="$BOOST_CHRONO_LIB $BOOST_CHRONO_EXTRALIBS" - TEMP_LIBS="$LIBS" -LIBS="$LIBS $BOOST_LIBS $BOOST_CHRONO_LIB" +LIBS="$BOOST_LIBS $BOOST_CHRONO_LIB $LIBS" TEMP_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" AC_TRY_LINK([ @@ -486,7 +485,7 @@ fi if test x$boost_sleep != xyes; then TEMP_LIBS="$LIBS" -LIBS="$LIBS $BOOST_LIBS" +LIBS="$BOOST_LIBS $LIBS" TEMP_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" AC_TRY_LINK([ |