Skip to content

Commit

Permalink
Merge pull request #2 from qtumproject/update-evm
Browse files Browse the repository at this point in the history
Update evm
  • Loading branch information
Huaming He authored Aug 2, 2018
2 parents 57be455 + c519bac commit 6f7c254
Show file tree
Hide file tree
Showing 503 changed files with 29,211 additions and 18,212 deletions.
122 changes: 122 additions & 0 deletions build-aux/m4/ax_boost_log.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
# ===========================================================================
# https://www.gnu.org/software/autoconf-archive/ax_boost_log.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_BOOST_LOG
#
# DESCRIPTION
#
# Test for Log library from the Boost C++ libraries. The macro requires a
# preceding call to AX_BOOST_BASE. Further documentation is available at
# <http://randspringer.de/boost/index.html>.
#
# This macro calls:
#
# AC_SUBST(BOOST_LOG_LIB)
#
# And sets:
#
# HAVE_BOOST_LOG
#
# LICENSE
#
# Copyright (c) 2008 Thomas Porschberg <[email protected]>
# Copyright (c) 2008 Michael Tindal
# Copyright (c) 2013 Daniel Casimiro <[email protected]>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.

#serial 2

AC_DEFUN([AX_BOOST_LOG],
[
AC_ARG_WITH([boost-log],
AS_HELP_STRING([--with-boost-log@<:@=special-lib@:>@],
[use the Log library from boost - it is possible to specify a certain library for the linker
e.g. --with-boost-log=boost_log-gcc-mt ]), [
if test "$withval" = "no"; then
want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ax_boost_user_log_lib=""
else
want_boost="yes"
ax_boost_user_log_lib="$withval"
fi
], [want_boost="yes"]
)
if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_CANONICAL_BUILD])
CPPFLAGS_SAVED="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
export CPPFLAGS
LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
export LDFLAGS
AC_CACHE_CHECK(whether the Boost::Log library is available,
ax_cv_boost_log,
[AC_LANG_PUSH([C++])
CXXFLAGS_SAVE=$CXXFLAGS
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[@%:@include <boost/log/trivial.hpp>]],
[[BOOST_LOG_TRIVIAL(trace) << "A boost::log test";]])],
ax_cv_boost_log=yes, ax_cv_boost_log=no)
CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_POP([C++])
])
if test "x$ax_cv_boost_log" = "xyes"; then
AC_SUBST(BOOST_CPPFLAGS)
AC_DEFINE(HAVE_BOOST_LOG,,[define if the Boost::Log library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_log_lib" = "x"; then
for libextension in `ls $BOOSTLIBDIR/libboost_log*.so* $BOOSTLIBDIR/libboost_log*.dylib* $BOOSTLIBDIR/libboost_log*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_log.*\)\.so.*$;\1;' -e 's;^lib\(boost_log.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_log.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_LOG_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_LIB) link_log="yes"; break],
[link_log="no"])
done
if test "x$link_log" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_log*.dll* $BOOSTLIBDIR/boost_log*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_log.*\)\.dll.*$;\1;' -e 's;^\(boost_log.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_LOG_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_LIB) link_log="yes"; break],
[link_log="no"])
done
fi
else
for ax_lib in $ax_boost_user_log_lib boost_log-$ax_boost_user_log_lib; do
AC_CHECK_LIB($ax_lib, exit,
[BOOST_LOG_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_LIB) link_log="yes"; break],
[link_log="no"])
done
fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the library!)
fi
if test "x$link_log" = "xno"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
fi
fi
CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
fi
])
113 changes: 113 additions & 0 deletions build-aux/m4/ax_boost_log_setup.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
# ===========================================================================
# https://www.gnu.org/software/autoconf-archive/ax_boost_log_setup.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_BOOST_LOG_SETUP
#
# DESCRIPTION
#
# Test for LogSetup library from the Boost C++ libraries. The macro
# requires a preceding call to AX_BOOST_BASE. Further documentation is
# available at <http://randspringer.de/boost/index.html>.
#
# This macro calls:
#
# AC_SUBST(BOOST_LOG_SETUP_LIB)
#
# And sets:
#
# HAVE_BOOST_LOG_SETUP
#
# LICENSE
#
# Copyright (c) 2008 Thomas Porschberg <[email protected]>
# Copyright (c) 2008 Michael Tindal
# Copyright (c) 2013 Daniel Casimiro <[email protected]>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.

#serial 2

AC_DEFUN([AX_BOOST_LOG_SETUP],
[
AC_ARG_WITH([boost-log_setup],
AS_HELP_STRING([--with-boost-log_setup@<:@=special-lib@:>@],
[use the Log_setup library from boost - it is possible to specify a certain library for the linker
e.g. --with-boost-log_setup=boost_log_setup-gcc-mt ]),
[
if test "$withval" = "no"; then
want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ax_boost_user_log_setup_lib=""
else
want_boost="yes"
ax_boost_user_log_setup_lib="$withval"
fi
],
[want_boost="yes"]
)
if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_CANONICAL_BUILD])
AC_REQUIRE([AX_BOOST_LOG])
CPPFLAGS_SAVED="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
export CPPFLAGS
LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
export LDFLAGS
AC_SUBST(BOOST_CPPFLAGS)
AC_DEFINE(HAVE_BOOST_LOG_SETUP,,
[define if the Boost::Log_setup library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_log_setup_lib" = "x"; then
for libextension in `ls $BOOSTLIBDIR/libboost_log_setup*.so* $BOOSTLIBDIR/libboost_log_setup*.dylib* $BOOSTLIBDIR/libboost_log_setup*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_log_setup.*\)\.so.*$;\1;' -e 's;^lib\(boost_log_setup.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_log_setup.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_LOG_SETUP_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_SETUP_LIB) link_log_setup="yes"; break],
[link_log_setup="no"])
done
if test "x$link_log_setup" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_log_setup*.dll* $BOOSTLIBDIR/boost_log_setup*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_log_setup.*\)\.dll.*$;\1;' -e 's;^\(boost_log_setup.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_LOG_SETUP_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_SETUP_LIB) link_log_setup="yes"; break],
[link_log_setup="no"])
done
fi
else
for ax_lib in $ax_boost_user_log_setup_lib boost_log_setup-$ax_boost_user_log_setup_lib; do
AC_CHECK_LIB($ax_lib, exit,
[BOOST_LOG_SETUP_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_SETUP_LIB) link_log_setup="yes"; break],
[link_log_setup="no"])
done
fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the library!)
fi
if test "x$link_log_setup" = "xno"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
fi
CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
fi
])
12 changes: 11 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ case $host in
esac

CRYPTOPP_TARGET_FLAGS=""
LIBFF_TARGET_FLAGS=""

if test x$use_pkgconfig = xyes; then
m4_ifndef([PKG_PROG_PKG_CONFIG], [AC_MSG_ERROR(PKG_PROG_PKG_CONFIG macro not found. Please install pkg-config and re-run autogen.sh.)])
Expand Down Expand Up @@ -720,6 +721,12 @@ AM_CONDITIONAL([EMBEDDED_CRYPTOPP],[true])
AC_SUBST(CRYPTOPP_CPPFLAGS)
AC_SUBST(LIBCRYPTOPP)

LIBFF_CPPFLAGS=
LIBFF=
AM_CONDITIONAL([EMBEDDED_LIBFF],[true])
AC_SUBST(LIBFF_CPPFLAGS)
AC_SUBST(LIBFF)


if test x$enable_wallet != xno; then
dnl Check for libdb_cxx only if wallet enabled
Expand Down Expand Up @@ -759,6 +766,8 @@ AX_BOOST_PROGRAM_OPTIONS
AX_BOOST_THREAD
AX_BOOST_RANDOM
AX_BOOST_CHRONO
AX_BOOST_LOG
AX_BOOST_LOG_SETUP

dnl Boost 1.56 through 1.62 allow using std::atomic instead of its own atomic
dnl counter implementations. In 1.63 and later the std::atomic approach is default.
Expand Down Expand Up @@ -825,7 +834,7 @@ fi

if test x$use_boost = xyes; then

BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB $BOOST_CHRONO_LIB $BOOST_RANDOM_LIB"
BOOST_LIBS="$BOOST_LDFLAGS $BOOST_LOG_LIB $BOOST_LOG_SETUP_LIB $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB $BOOST_CHRONO_LIB $BOOST_RANDOM_LIB"


dnl If boost (prior to 1.57) was built without c++11, it emulated scoped enums
Expand Down Expand Up @@ -1237,6 +1246,7 @@ AC_SUBST(BOOST_LIBS)
AC_SUBST(TESTDEFS)
AC_SUBST(LEVELDB_TARGET_FLAGS)
AC_SUBST(CRYPTOPP_TARGET_FLAGS)
AC_SUBST(LIBFF_TARGET_FLAGS)
AC_SUBST(MINIUPNPC_CPPFLAGS)
AC_SUBST(MINIUPNPC_LIBS)
AC_SUBST(CRYPTO_LIBS)
Expand Down
Loading

0 comments on commit 6f7c254

Please sign in to comment.