Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 559590 | Differences between
and this patch

Collapse All | Expand All

(-)a/build-aux/m4/bitcoin_subdir_to_include.m4 (-1 / +1 lines)
Lines 5-11 AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ Link Here
5
    AC_MSG_RESULT([default])
5
    AC_MSG_RESULT([default])
6
  else
6
  else
7
    echo "#include <$2$3.h>" >conftest.cpp
7
    echo "#include <$2$3.h>" >conftest.cpp
8
    newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`]
8
    newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d])
9
    AC_MSG_RESULT([${newinclpath}])
9
    AC_MSG_RESULT([${newinclpath}])
10
    if test "x${newinclpath}" != "x"; then
10
    if test "x${newinclpath}" != "x"; then
11
      eval "$1=\"\$$1\"' -I${newinclpath}'"
11
      eval "$1=\"\$$1\"' -I${newinclpath}'"
(-)a/configure.ac (-6 / +75 lines)
Lines 170-175 AC_ARG_WITH([utils], Link Here
170
  [build_bitcoin_utils=$withval],
170
  [build_bitcoin_utils=$withval],
171
  [build_bitcoin_utils=yes])
171
  [build_bitcoin_utils=yes])
172
172
173
AC_ARG_ENABLE([util-cli],
174
  [AS_HELP_STRING([--enable-util-cli],
175
  [build bitcoin-cli])],
176
  [build_bitcoin_cli=$enableval],
177
  [build_bitcoin_cli=$build_bitcoin_utils])
178
179
AC_ARG_ENABLE([util-tx],
180
  [AS_HELP_STRING([--enable-util-tx],
181
  [build bitcoin-tx])],
182
  [build_bitcoin_tx=$enableval],
183
  [build_bitcoin_tx=$build_bitcoin_utils])
184
173
AC_ARG_WITH([libs],
185
AC_ARG_WITH([libs],
174
  [AS_HELP_STRING([--with-libs],
186
  [AS_HELP_STRING([--with-libs],
175
  [build libraries (default=yes)])],
187
  [build libraries (default=yes)])],
Lines 488-501 if test x$use_reduce_exports = xyes; then Link Here
488
  [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
500
  [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
489
fi
501
fi
490
502
503
dnl Check for leveldb, only if explicitly requested
491
LEVELDB_CPPFLAGS=
504
LEVELDB_CPPFLAGS=
492
LIBLEVELDB=
505
LIBLEVELDB=
493
LIBMEMENV=
506
LIBMEMENV=
494
AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
507
AC_ARG_WITH([system-leveldb],
508
  [AS_HELP_STRING([--with-system-leveldb],
509
  [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
510
  [system_leveldb=$withval],
511
  [system_leveldb=no]
512
)
513
if test x$system_leveldb != xno; then
514
  LEVELDB_CPPFLAGS=
515
  AC_CHECK_LIB([leveldb],[main],[
516
    LIBLEVELDB=-lleveldb
517
  ],[
518
    AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])
519
  ])
520
  TEMP_LIBS="$LIBS"
521
  LIBS="$LIBS $LIBLEVELDB"
522
  AC_CHECK_LIB([memenv],[main],[
523
    LIBMEMENV=-lmemenv
524
  ],[
525
    AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway])
526
  ])
527
  LIBS="$TEMP_LIBS"
528
  AC_CHECK_HEADER([leveldb/filter_policy.h],[],[
529
    AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
530
  ])
531
  AC_CHECK_HEADER([leveldb/helpers/memenv.h],[
532
    AC_MSG_CHECKING([for memenv.h path])
533
    BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv])
534
  ],[
535
    AC_CHECK_HEADER([memenv.h],[],[
536
      AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
537
    ])
538
  ])
539
fi
540
AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
495
AC_SUBST(LEVELDB_CPPFLAGS)
541
AC_SUBST(LEVELDB_CPPFLAGS)
496
AC_SUBST(LIBLEVELDB)
542
AC_SUBST(LIBLEVELDB)
497
AC_SUBST(LIBMEMENV)
543
AC_SUBST(LIBMEMENV)
498
544
545
dnl Check for libsecp256k1, only if explicitly requested
546
AC_ARG_WITH([system-libsecp256k1],
547
  [AS_HELP_STRING([--with-system-libsecp256k1],
548
  [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])],
549
  [system_libsecp256k1=$withval],
550
  [system_libsecp256k1=no]
551
)
552
if test x$system_libsecp256k1 != xno; then
553
  PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
554
else
555
  libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
556
  libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
557
fi
558
AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno])
559
AC_SUBST(libsecp256k1_CFLAGS)
560
AC_SUBST(libsecp256k1_LIBS)
561
499
if test x$enable_wallet != xno; then
562
if test x$enable_wallet != xno; then
500
    dnl Check for libdb_cxx only if wallet enabled
563
    dnl Check for libdb_cxx only if wallet enabled
501
    BITCOIN_FIND_BDB48
564
    BITCOIN_FIND_BDB48
Lines 515-521 BITCOIN_QT_INIT Link Here
515
dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
578
dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
516
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
579
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
517
580
518
if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
581
if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
519
    use_boost=no
582
    use_boost=no
520
else
583
else
521
    use_boost=yes
584
    use_boost=yes
Lines 701-709 AC_MSG_CHECKING([whether to build bitcoind]) Link Here
701
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
764
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
702
AC_MSG_RESULT($build_bitcoind)
765
AC_MSG_RESULT($build_bitcoind)
703
766
704
AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
767
AC_MSG_CHECKING([whether to build bitcoin-cli])
705
AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
768
AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
706
AC_MSG_RESULT($build_bitcoin_utils)
769
AC_MSG_RESULT($build_bitcoin_cli)
770
771
AC_MSG_CHECKING([whether to build bitcoin-tx])
772
AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes])
773
AC_MSG_RESULT($build_bitcoin_tx)
707
774
708
AC_MSG_CHECKING([whether to build libraries])
775
AC_MSG_CHECKING([whether to build libraries])
709
AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
776
AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
Lines 826-832 else Link Here
826
  AC_MSG_RESULT([no])
893
  AC_MSG_RESULT([no])
827
fi
894
fi
828
895
829
if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
896
if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then
830
  AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
897
  AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
831
fi
898
fi
832
899
Lines 895-902 PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" Link Here
895
unset PKG_CONFIG_LIBDIR
962
unset PKG_CONFIG_LIBDIR
896
PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
963
PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
897
964
965
if test x$system_libsecp256k1 = xno; then
898
ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no"
966
ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no"
899
AC_CONFIG_SUBDIRS([src/secp256k1])
967
AC_CONFIG_SUBDIRS([src/secp256k1])
968
fi
900
969
901
AC_OUTPUT
970
AC_OUTPUT
902
971
(-)a/qa/pull-tester/rpc-tests.sh (-1 / +1 lines)
Lines 57-63 testScriptsExt=( Link Here
57
extArg="-extended"
57
extArg="-extended"
58
passOn=${@#$extArg}
58
passOn=${@#$extArg}
59
59
60
if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then
60
if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then
61
    for (( i = 0; i < ${#testScripts[@]}; i++ ))
61
    for (( i = 0; i < ${#testScripts[@]}; i++ ))
62
    do
62
    do
63
        if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ]
63
        if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ]
(-)a/qa/pull-tester/tests-config.sh.in (-1 / +1 lines)
Lines 8-14 EXEEXT="@EXEEXT@" Link Here
8
8
9
# These will turn into comments if they were disabled when configuring.
9
# These will turn into comments if they were disabled when configuring.
10
@ENABLE_WALLET_TRUE@ENABLE_WALLET=1
10
@ENABLE_WALLET_TRUE@ENABLE_WALLET=1
11
@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
11
@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1
12
@BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
12
@BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
13
13
14
REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}"
14
REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}"
(-)a/src/Makefile.am (-3 / +14 lines)
Lines 1-4 Link Here
1
if EMBEDDED_LIBSECP256K1
1
DIST_SUBDIRS = secp256k1
2
DIST_SUBDIRS = secp256k1
3
endif
2
AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
4
AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
3
5
4
6
Lines 20-26 endif Link Here
20
BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
22
BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
21
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
23
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
22
24
23
BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
25
BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS)
24
26
25
LIBBITCOIN_SERVER=libbitcoin_server.a
27
LIBBITCOIN_SERVER=libbitcoin_server.a
26
LIBBITCOIN_WALLET=libbitcoin_wallet.a
28
LIBBITCOIN_WALLET=libbitcoin_wallet.a
Lines 30-39 LIBBITCOIN_UTIL=libbitcoin_util.a Link Here
30
LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
32
LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
31
LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
33
LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
32
LIBBITCOINQT=qt/libbitcoinqt.a
34
LIBBITCOINQT=qt/libbitcoinqt.a
35
if EMBEDDED_LIBSECP256K1
33
LIBSECP256K1=secp256k1/libsecp256k1.la
36
LIBSECP256K1=secp256k1/libsecp256k1.la
37
else
38
LIBSECP256K1=$(libsecp256k1_LIBS)
39
endif
34
40
41
if EMBEDDED_LIBSECP256K1
35
$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
42
$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
36
	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
43
	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
44
endif
37
45
38
# Make is not made aware of per-object dependencies to avoid limiting building parallelization
46
# Make is not made aware of per-object dependencies to avoid limiting building parallelization
39
# But to build the less dependent modules first, we manually select their order here:
47
# But to build the less dependent modules first, we manually select their order here:
Lines 63-70 if BUILD_BITCOIND Link Here
63
  bin_PROGRAMS += bitcoind
71
  bin_PROGRAMS += bitcoind
64
endif
72
endif
65
73
66
if BUILD_BITCOIN_UTILS
74
if BUILD_BITCOIN_CLI
67
  bin_PROGRAMS += bitcoin-cli bitcoin-tx
75
  bin_PROGRAMS += bitcoin-cli
76
endif
77
if BUILD_BITCOIN_TX
78
  bin_PROGRAMS += bitcoin-tx
68
endif
79
endif
69
80
70
.PHONY: FORCE
81
.PHONY: FORCE
(-)a/src/Makefile.test.include (+2 lines)
Lines 111-120 bitcoin_test_check: $(TEST_BINARY) FORCE Link Here
111
bitcoin_test_clean : FORCE
111
bitcoin_test_clean : FORCE
112
	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
112
	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
113
113
114
if EMBEDDED_LIBSECP256K1
114
check-local:
115
check-local:
115
	@echo "Running test/bitcoin-util-test.py..."
116
	@echo "Running test/bitcoin-util-test.py..."
116
	$(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
117
	$(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
117
	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
118
	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
119
endif
118
120
119
%.json.h: %.json
121
%.json.h: %.json
120
	@$(MKDIR_P) $(@D)
122
	@$(MKDIR_P) $(@D)

Return to bug 559590