Upgrade depends Boost to 1.91
This commit is contained in:
@@ -64,7 +64,7 @@ AC_DEFUN([AX_BOOST_SYSTEM],
|
|||||||
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
||||||
export LDFLAGS
|
export LDFLAGS
|
||||||
|
|
||||||
AC_CACHE_CHECK(whether the Boost::System library is available,
|
AC_CACHE_CHECK(whether Boost::System headers are available,
|
||||||
ax_cv_boost_system,
|
ax_cv_boost_system,
|
||||||
[AC_LANG_PUSH([C++])
|
[AC_LANG_PUSH([C++])
|
||||||
CXXFLAGS_SAVE=$CXXFLAGS
|
CXXFLAGS_SAVE=$CXXFLAGS
|
||||||
@@ -80,40 +80,8 @@ AC_DEFUN([AX_BOOST_SYSTEM],
|
|||||||
AC_SUBST(BOOST_CPPFLAGS)
|
AC_SUBST(BOOST_CPPFLAGS)
|
||||||
|
|
||||||
AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
|
AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
|
||||||
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
|
BOOST_SYSTEM_LIB=""
|
||||||
|
AC_SUBST(BOOST_SYSTEM_LIB)
|
||||||
LDFLAGS_SAVE=$LDFLAGS
|
|
||||||
if test "x$ax_boost_user_system_lib" = "x"; then
|
|
||||||
ax_lib=
|
|
||||||
for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
|
|
||||||
ax_lib=${libextension}
|
|
||||||
AC_CHECK_LIB($ax_lib, exit,
|
|
||||||
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
|
|
||||||
[link_system="no"])
|
|
||||||
done
|
|
||||||
if test "x$link_system" != "xyes"; then
|
|
||||||
for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
|
|
||||||
ax_lib=${libextension}
|
|
||||||
AC_CHECK_LIB($ax_lib, exit,
|
|
||||||
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
|
|
||||||
[link_system="no"])
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
|
|
||||||
AC_CHECK_LIB($ax_lib, exit,
|
|
||||||
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
|
|
||||||
[link_system="no"])
|
|
||||||
done
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test "x$ax_lib" = "x"; then
|
|
||||||
AC_MSG_ERROR(Could not find a version of the boost_system library!)
|
|
||||||
fi
|
|
||||||
if test "x$link_system" = "xno"; then
|
|
||||||
AC_MSG_ERROR(Could not link against $ax_lib !)
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS_SAVED"
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
|
|||||||
@@ -31105,8 +31105,8 @@ fi
|
|||||||
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
||||||
export LDFLAGS
|
export LDFLAGS
|
||||||
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Boost::System library is available" >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Boost::System headers are available" >&5
|
||||||
printf %s "checking whether the Boost::System library is available... " >&6; }
|
printf %s "checking whether Boost::System headers are available... " >&6; }
|
||||||
if test ${ax_cv_boost_system+y}
|
if test ${ax_cv_boost_system+y}
|
||||||
then :
|
then :
|
||||||
printf %s "(cached) " >&6
|
printf %s "(cached) " >&6
|
||||||
@@ -31155,160 +31155,8 @@ printf "%s\n" "$ax_cv_boost_system" >&6; }
|
|||||||
|
|
||||||
printf "%s\n" "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h
|
printf "%s\n" "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h
|
||||||
|
|
||||||
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
|
BOOST_SYSTEM_LIB=""
|
||||||
|
|
||||||
LDFLAGS_SAVE=$LDFLAGS
|
|
||||||
if test "x$ax_boost_user_system_lib" = "x"; then
|
|
||||||
ax_lib=
|
|
||||||
for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
|
|
||||||
ax_lib=${libextension}
|
|
||||||
as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh`
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
|
|
||||||
printf %s "checking for exit in -l$ax_lib... " >&6; }
|
|
||||||
if eval test \${$as_ac_Lib+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-l$ax_lib $LIBS"
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
namespace conftest {
|
|
||||||
extern "C" int exit ();
|
|
||||||
}
|
|
||||||
int
|
|
||||||
main (void)
|
|
||||||
{
|
|
||||||
return conftest::exit ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_cxx_try_link "$LINENO"
|
|
||||||
then :
|
|
||||||
eval "$as_ac_Lib=yes"
|
|
||||||
else $as_nop
|
|
||||||
eval "$as_ac_Lib=no"
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
LIBS=$ac_check_lib_save_LIBS
|
|
||||||
fi
|
|
||||||
eval ac_res=\$$as_ac_Lib
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
||||||
printf "%s\n" "$ac_res" >&6; }
|
|
||||||
if eval test \"x\$"$as_ac_Lib"\" = x"yes"
|
|
||||||
then :
|
|
||||||
BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
|
|
||||||
else $as_nop
|
|
||||||
link_system="no"
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
|
||||||
if test "x$link_system" != "xyes"; then
|
|
||||||
for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
|
|
||||||
ax_lib=${libextension}
|
|
||||||
as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh`
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
|
|
||||||
printf %s "checking for exit in -l$ax_lib... " >&6; }
|
|
||||||
if eval test \${$as_ac_Lib+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-l$ax_lib $LIBS"
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
namespace conftest {
|
|
||||||
extern "C" int exit ();
|
|
||||||
}
|
|
||||||
int
|
|
||||||
main (void)
|
|
||||||
{
|
|
||||||
return conftest::exit ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_cxx_try_link "$LINENO"
|
|
||||||
then :
|
|
||||||
eval "$as_ac_Lib=yes"
|
|
||||||
else $as_nop
|
|
||||||
eval "$as_ac_Lib=no"
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
LIBS=$ac_check_lib_save_LIBS
|
|
||||||
fi
|
|
||||||
eval ac_res=\$$as_ac_Lib
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
||||||
printf "%s\n" "$ac_res" >&6; }
|
|
||||||
if eval test \"x\$"$as_ac_Lib"\" = x"yes"
|
|
||||||
then :
|
|
||||||
BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
|
|
||||||
else $as_nop
|
|
||||||
link_system="no"
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
|
|
||||||
as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh`
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
|
|
||||||
printf %s "checking for exit in -l$ax_lib... " >&6; }
|
|
||||||
if eval test \${$as_ac_Lib+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-l$ax_lib $LIBS"
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
namespace conftest {
|
|
||||||
extern "C" int exit ();
|
|
||||||
}
|
|
||||||
int
|
|
||||||
main (void)
|
|
||||||
{
|
|
||||||
return conftest::exit ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_cxx_try_link "$LINENO"
|
|
||||||
then :
|
|
||||||
eval "$as_ac_Lib=yes"
|
|
||||||
else $as_nop
|
|
||||||
eval "$as_ac_Lib=no"
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
LIBS=$ac_check_lib_save_LIBS
|
|
||||||
fi
|
|
||||||
eval ac_res=\$$as_ac_Lib
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
||||||
printf "%s\n" "$ac_res" >&6; }
|
|
||||||
if eval test \"x\$"$as_ac_Lib"\" = x"yes"
|
|
||||||
then :
|
|
||||||
BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
|
|
||||||
else $as_nop
|
|
||||||
link_system="no"
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test "x$ax_lib" = "x"; then
|
|
||||||
as_fn_error $? "Could not find a version of the boost_system library!" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
if test "x$link_system" = "xno"; then
|
|
||||||
as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS_SAVED"
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package=boost
|
package=boost
|
||||||
$(package)_version=1_64_0
|
$(package)_version=1_91_0
|
||||||
# Bintray was shut down; use the official Boost archives mirror.
|
# Bintray was shut down; use the official Boost archives mirror.
|
||||||
# NOTE: download_path should NOT end with a trailing slash because the fetch
|
# NOTE: download_path should NOT end with a trailing slash because the fetch
|
||||||
# helper appends "/$(file)".
|
# helper appends "/$(file)".
|
||||||
$(package)_download_path=https://archives.boost.io/release/1.64.0/source
|
$(package)_download_path=https://archives.boost.io/release/1.91.0/source
|
||||||
$(package)_file_name=$(package)_$($(package)_version).tar.bz2
|
$(package)_file_name=$(package)_$($(package)_version).tar.bz2
|
||||||
$(package)_sha256_hash=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332
|
$(package)_sha256_hash=de5e6b0e4913395c6bdfa90537febd9028ea4c0735d2cdb0cd9b45d5f51264f5
|
||||||
|
|
||||||
define $(package)_set_vars
|
define $(package)_set_vars
|
||||||
$(package)_config_opts_release=variant=release
|
$(package)_config_opts_release=variant=release
|
||||||
@@ -26,7 +26,7 @@ $(package)_toolset_$(host_os)=gcc
|
|||||||
$(package)_archiver_$(host_os)=$($(package)_ar)
|
$(package)_archiver_$(host_os)=$($(package)_ar)
|
||||||
$(package)_toolset_darwin=darwin
|
$(package)_toolset_darwin=darwin
|
||||||
$(package)_archiver_darwin=$($(package)_libtool)
|
$(package)_archiver_darwin=$($(package)_libtool)
|
||||||
$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test
|
$(package)_config_libraries=chrono,filesystem,program_options,thread,test
|
||||||
$(package)_cxxflags=-std=c++11 -fvisibility=hidden
|
$(package)_cxxflags=-std=c++11 -fvisibility=hidden
|
||||||
$(package)_cxxflags_linux=-fPIC
|
$(package)_cxxflags_linux=-fPIC
|
||||||
endef
|
endef
|
||||||
|
|||||||
@@ -57,6 +57,10 @@
|
|||||||
#include <QUrlQuery>
|
#include <QUrlQuery>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
|
using boost::placeholders::_1;
|
||||||
|
using boost::placeholders::_2;
|
||||||
|
using boost::placeholders::_3;
|
||||||
|
|
||||||
const QString BitcoinGUI::DEFAULT_WALLET = "~Default";
|
const QString BitcoinGUI::DEFAULT_WALLET = "~Default";
|
||||||
|
|
||||||
BitcoinGUI::BitcoinGUI(const NetworkStyle* networkStyle, QWidget* parent) : QMainWindow(parent),
|
BitcoinGUI::BitcoinGUI(const NetworkStyle* networkStyle, QWidget* parent) : QMainWindow(parent),
|
||||||
|
|||||||
@@ -28,6 +28,9 @@
|
|||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
|
using boost::placeholders::_1;
|
||||||
|
using boost::placeholders::_2;
|
||||||
|
|
||||||
static const int64_t nClientStartupTime = GetTime();
|
static const int64_t nClientStartupTime = GetTime();
|
||||||
|
|
||||||
ClientModel::ClientModel(OptionsModel* optionsModel, QObject* parent) : QObject(parent),
|
ClientModel::ClientModel(OptionsModel* optionsModel, QObject* parent) : QObject(parent),
|
||||||
|
|||||||
@@ -24,6 +24,9 @@
|
|||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QScreen>
|
#include <QScreen>
|
||||||
|
|
||||||
|
using boost::placeholders::_1;
|
||||||
|
using boost::placeholders::_2;
|
||||||
|
|
||||||
SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle* networkStyle) : QWidget(0, f), curAlignment(0)
|
SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle* networkStyle) : QWidget(0, f), curAlignment(0)
|
||||||
{
|
{
|
||||||
// set reference point, paddings
|
// set reference point, paddings
|
||||||
|
|||||||
@@ -28,6 +28,10 @@
|
|||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
#include <QList>
|
#include <QList>
|
||||||
|
|
||||||
|
using boost::placeholders::_1;
|
||||||
|
using boost::placeholders::_2;
|
||||||
|
using boost::placeholders::_3;
|
||||||
|
|
||||||
// Amount column is right-aligned it contains numbers
|
// Amount column is right-aligned it contains numbers
|
||||||
static int column_alignments[] = {
|
static int column_alignments[] = {
|
||||||
Qt::AlignLeft | Qt::AlignVCenter, /* status */
|
Qt::AlignLeft | Qt::AlignVCenter, /* status */
|
||||||
|
|||||||
@@ -27,6 +27,12 @@
|
|||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
using boost::placeholders::_1;
|
||||||
|
using boost::placeholders::_2;
|
||||||
|
using boost::placeholders::_3;
|
||||||
|
using boost::placeholders::_4;
|
||||||
|
using boost::placeholders::_5;
|
||||||
|
using boost::placeholders::_6;
|
||||||
|
|
||||||
WalletModel::WalletModel(CWallet* wallet, OptionsModel* optionsModel, QObject* parent) : QObject(parent), wallet(wallet), optionsModel(optionsModel), addressTableModel(0),
|
WalletModel::WalletModel(CWallet* wallet, OptionsModel* optionsModel, QObject* parent) : QObject(parent), wallet(wallet), optionsModel(optionsModel), addressTableModel(0),
|
||||||
transactionTableModel(0),
|
transactionTableModel(0),
|
||||||
|
|||||||
@@ -1076,7 +1076,9 @@ bool AttemptBackupWallet(const CWallet& wallet, const filesystem::path& pathSrc,
|
|||||||
LogPrintf("cannot backup to wallet source file %s\n", pathDest.string());
|
LogPrintf("cannot backup to wallet source file %s\n", pathDest.string());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#if BOOST_VERSION >= 105800 /* BOOST_LIB_VERSION 1_58 */
|
#if BOOST_VERSION >= 107400 /* BOOST_LIB_VERSION 1_74 */
|
||||||
|
filesystem::copy_file(pathSrc.c_str(), pathDest, filesystem::copy_options::overwrite_existing);
|
||||||
|
#elif BOOST_VERSION >= 105800 /* BOOST_LIB_VERSION 1_58 */
|
||||||
filesystem::copy_file(pathSrc.c_str(), pathDest, filesystem::copy_option::overwrite_if_exists);
|
filesystem::copy_file(pathSrc.c_str(), pathDest, filesystem::copy_option::overwrite_if_exists);
|
||||||
#else
|
#else
|
||||||
std::ifstream src(pathSrc.c_str(), std::ios::binary | std::ios::in);
|
std::ifstream src(pathSrc.c_str(), std::ios::binary | std::ios::in);
|
||||||
|
|||||||
Reference in New Issue
Block a user