Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'remotes/upstream/master' into coedeface…
…/merge-0.18.1 # Conflicts: # src/Makefile.am # src/script/standard.cpp # src/script/standard.h # test/functional/test_runner.py
- Loading branch information
Showing
221 changed files
with
26,076 additions
and
1,065 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
[submodule "src/cpp-ethereum"] | ||
path = src/cpp-ethereum | ||
url = https://github.com/qtumproject/cpp-eth-qtum.git | ||
branch = time/aleth |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
# ============================================================================ | ||
# http://www.gnu.org/software/autoconf-archive/ax_boost_program_options.html | ||
# ============================================================================ | ||
# | ||
# SYNOPSIS | ||
# | ||
# AX_BOOST_PROGRAM_OPTIONS | ||
# | ||
# DESCRIPTION | ||
# | ||
# Test for program options 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_PROGRAM_OPTIONS_LIB) | ||
# | ||
# And sets: | ||
# | ||
# HAVE_BOOST_PROGRAM_OPTIONS | ||
# | ||
# LICENSE | ||
# | ||
# Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de> | ||
# | ||
# 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 24 | ||
|
||
AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS], | ||
[ | ||
AC_ARG_WITH([boost-program-options], | ||
AS_HELP_STRING([--with-boost-program-options@<:@=special-lib@:>@], | ||
[use the program options library from boost - it is possible to specify a certain library for the linker | ||
e.g. --with-boost-program-options=boost_program_options-gcc-mt-1_33_1 ]), | ||
[ | ||
if test "$withval" = "no"; then | ||
want_boost="no" | ||
elif test "$withval" = "yes"; then | ||
want_boost="yes" | ||
ax_boost_user_program_options_lib="" | ||
else | ||
want_boost="yes" | ||
ax_boost_user_program_options_lib="$withval" | ||
fi | ||
], | ||
[want_boost="yes"] | ||
) | ||
if test "x$want_boost" = "xyes"; then | ||
AC_REQUIRE([AC_PROG_CC]) | ||
export want_boost | ||
CPPFLAGS_SAVED="$CPPFLAGS" | ||
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" | ||
export CPPFLAGS | ||
LDFLAGS_SAVED="$LDFLAGS" | ||
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" | ||
export LDFLAGS | ||
AC_CACHE_CHECK([whether the Boost::Program_Options library is available], | ||
ax_cv_boost_program_options, | ||
[AC_LANG_PUSH(C++) | ||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/program_options/errors.hpp> | ||
]], | ||
[[boost::program_options::error err("Error message"); | ||
return 0;]])], | ||
ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no) | ||
AC_LANG_POP([C++]) | ||
]) | ||
if test "$ax_cv_boost_program_options" = yes; then | ||
AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available]) | ||
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` | ||
if test "x$ax_boost_user_program_options_lib" = "x"; then | ||
for libextension in `ls $BOOSTLIBDIR/libboost_program_options*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.dylib* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.dylib.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.a.*$;\1;'` ; do | ||
ax_lib=${libextension} | ||
AC_CHECK_LIB($ax_lib, exit, | ||
[BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break], | ||
[link_program_options="no"]) | ||
done | ||
if test "x$link_program_options" != "xyes"; then | ||
for libextension in `ls $BOOSTLIBDIR/boost_program_options*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.a.*$;\1;'` ; do | ||
ax_lib=${libextension} | ||
AC_CHECK_LIB($ax_lib, exit, | ||
[BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break], | ||
[link_program_options="no"]) | ||
done | ||
fi | ||
else | ||
for ax_lib in $ax_boost_user_program_options_lib boost_program_options-$ax_boost_user_program_options_lib; do | ||
AC_CHECK_LIB($ax_lib, main, | ||
[BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break], | ||
[link_program_options="no"]) | ||
done | ||
fi | ||
if test "x$ax_lib" = "x"; then | ||
AC_MSG_ERROR(Could not find a version of the boost_program_options library!) | ||
fi | ||
if test "x$link_program_options" != "xyes"; then | ||
AC_MSG_ERROR([Could not link against [$ax_lib] !]) | ||
fi | ||
fi | ||
CPPFLAGS="$CPPFLAGS_SAVED" | ||
LDFLAGS="$LDFLAGS_SAVED" | ||
fi | ||
]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
package=gmp | ||
$(package)_version=6.1.2 | ||
$(package)_sha256_hash=87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 | ||
$(package)_file_name=$(package)-$($(package)_version).tar.xz | ||
$(package)_download_path=https://gmplib.org/download/$(package) | ||
|
||
define $(package)_set_vars | ||
$(package)_config_opts=--enable-static=yes --enable-shared=no --enable-cxx | ||
$(package)_config_opts_linux=--with-pic | ||
endef | ||
|
||
define $(package)_preprocess_cmds | ||
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . | ||
endef | ||
|
||
define $(package)_config_cmds | ||
$($(package)_autoconf) | ||
endef | ||
|
||
define $(package)_build_cmds | ||
$(MAKE) | ||
endef | ||
|
||
define $(package)_stage_cmds | ||
$(MAKE) DESTDIR=$($(package)_staging_dir) install | ||
endef |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.