From d354526706953a6f77800f9c77f854e062fda635 Mon Sep 17 00:00:00 2001 From: Chris Kleeschulte Date: Tue, 7 Jul 2015 11:20:20 -0400 Subject: [PATCH] added support for libbitcoind.so/dylib --- config_me.sh | 1 + configure.ac | 31 +++++++++++++++++++++++++++++-- src/Makefile.am | 42 ++++++++++++++++++++++++++++++++++-------- src/bitcoind.cpp | 5 +++++ src/init.h | 5 +++++ src/leveldb/Makefile | 6 +++++- src/leveldbwrapper.h | 12 ++++++++++++ 7 files changed, 91 insertions(+), 11 deletions(-) create mode 100644 config_me.sh diff --git a/config_me.sh b/config_me.sh new file mode 100644 index 0000000..9623c59 --- /dev/null +++ b/config_me.sh @@ -0,0 +1 @@ +./configure --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --without-bdb --enable-debug --disable-wallet --without-utils --prefix=/home/k/source/bitcoind.js/platform/debian diff --git a/configure.ac b/configure.ac index 579035f..cd20489 100644 --- a/configure.ac +++ b/configure.ac @@ -126,6 +126,12 @@ AC_ARG_ENABLE([reduce-exports], [use_reduce_exports=$enableval], [use_reduce_exports=auto]) +AC_ARG_ENABLE([daemonlib], + [AS_HELP_STRING([--enable-daemonlib], + [compile all of bitcoind as a library (default is no)])], + [use_daemonlib=$enableval], + [use_daemonlib=no]) + AC_ARG_ENABLE([ccache], [AS_HELP_STRING([--enable-ccache], [use ccache for building (default is yes if ccache is found)])], @@ -409,6 +415,9 @@ fi if test x$use_hardening != xno; then AX_CHECK_COMPILE_FLAG([-Wstack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"]) AX_CHECK_COMPILE_FLAG([-fstack-protector-all],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"]) + if test x$use_daemonlib = xno; then + AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIE"]) + fi AX_CHECK_PREPROC_FLAG([-D_FORTIFY_SOURCE=2],[ AX_CHECK_PREPROC_FLAG([-U_FORTIFY_SOURCE],[ @@ -422,7 +431,7 @@ if test x$use_hardening != xno; then AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,relro"]) AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"]) - if test x$TARGET_OS != xwindows; then + if test x$TARGET_OS != xwindows -a x$use_daemonlib = xno; then # All windows code is PIC, forcing it on just adds useless compile warnings AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIE"]) AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"]) @@ -440,6 +449,17 @@ if test x$use_hardening != xno; then OBJCXXFLAGS="$CXXFLAGS" fi +AC_DEFINE([ENABLE_DAEMONLIB],[0],[Enable daemonlib.]) +AM_CONDITIONAL([ENABLE_DAEMONLIB],[false]) +if test x$use_daemonlib != xno; then + AX_CHECK_COMPILE_FLAG([-fPIC],[DAEMONLIB_CXXFLAGS="$DAEMONLIB_CXXFLAGS -fPIC"]) + AC_DEFINE([ENABLE_DAEMONLIB],[1],[Enable daemonlib.]) + AM_CONDITIONAL([ENABLE_DAEMONLIB],[true]) + CXXFLAGS="$CXXFLAGS $DAEMONLIB_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $DAEMONLIB_CPPFLAGS" + OBJCXXFLAGS="$CXXFLAGS" +fi + dnl this flag screws up non-darwin gcc even when the check fails. special-case it. if test x$TARGET_OS = xdarwin; then AX_CHECK_LINK_FLAG([[-Wl,-dead_strip]], [LDFLAGS="$LDFLAGS -Wl,-dead_strip"]) @@ -485,7 +505,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ ] ) -if test x$use_reduce_exports != xno; then +if test x$use_reduce_exports != xno -a x$use_daemonlib = xno; then AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],[RE_CXXFLAGS="-fvisibility=hidden"], [ if test x$use_reduce_exports = xyes; then @@ -496,6 +516,13 @@ if test x$use_reduce_exports != xno; then ]) fi +AC_MSG_CHECKING([whether to compile as daemonlib]) +if test x$use_daemonlib != xno; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi + LEVELDB_CPPFLAGS= LIBLEVELDB= LIBMEMENV= diff --git a/src/Makefile.am b/src/Makefile.am index 81b16d1..d05c91a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,7 @@ DIST_SUBDIRS = secp256k1 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) +lib_LTLIBRARIES = if EMBEDDED_LEVELDB LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include @@ -15,6 +16,10 @@ $(LIBLEVELDB) $(LIBMEMENV): @echo "Building LevelDB ..." && $(MAKE) -C $(@D) $(@F) CXX="$(CXX)" \ CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \ OPT="$(CXXFLAGS) $(CPPFLAGS)" + +LIBLEVELDB_SHARED: + @echo "Building the LevelDB shared library..." && $(MAKE) -C ./leveldb + endif BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config @@ -49,16 +54,16 @@ BITCOIN_INCLUDES += $(BDB_CPPFLAGS) EXTRA_LIBRARIES += libbitcoin_wallet.a endif -if BUILD_BITCOIN_LIBS -lib_LTLIBRARIES = libbitcoinconsensus.la -LIBBITCOIN_CONSENSUS=libbitcoinconsensus.la -else -LIBBITCOIN_CONSENSUS= -endif - +LIBBITCOIN_CONSENSUS = bin_PROGRAMS = TESTS = +if BUILD_BITCOIN_LIBS +lib_LTLIBRARIES += libbitcoinconsensus.la +LIBBITCOIN_CONSENSUS += libbitcoinconsensus.la +endif + +if !ENABLE_DAEMONLIB if BUILD_BITCOIND bin_PROGRAMS += bitcoind endif @@ -66,6 +71,9 @@ endif if BUILD_BITCOIN_UTILS bin_PROGRAMS += bitcoin-cli bitcoin-tx endif +else +lib_LTLIBRARIES += libbitcoind.la +endif .PHONY: FORCE # bitcoin core # @@ -156,8 +164,9 @@ obj/build.h: FORCE @$(MKDIR_P) $(builddir)/obj @$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \ $(abs_top_srcdir) -libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h +libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h +clientversion.cpp: obj/build.h # server: shared between bitcoind and bitcoin-qt libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) libbitcoin_server_a_SOURCES = \ @@ -304,16 +313,33 @@ bitcoind_LDADD = \ if ENABLE_WALLET bitcoind_LDADD += libbitcoin_wallet.a endif +MEMOBJ = helpers/memenv/memenv.lo +$(MEMOBJ): + @echo "Building the Memenv shared library..." && $(MAKE) -C ./leveldb $@ + bitcoind_SOURCES = bitcoind.cpp # +libbitcoind_la_SOURCES = bitcoind.cpp +libbitcoind_la_SOURCES += $(libbitcoin_util_a_SOURCES) +libbitcoind_la_SOURCES += $(libbitcoin_univalue_a_SOURCES) +libbitcoind_la_SOURCES += $(libbitcoin_crypto_a_SOURCES) +libbitcoind_la_SOURCES += $(libbitcoin_common_a_SOURCES) +libbitcoind_la_SOURCES += $(libbitcoin_server_a_SOURCES) +libbitcoind_la_SOURCES += $(crypto_libbitcoin_crypto_a_SOURCES) +libbitcoind_la_SOURCES += $(univalue_libbitcoin_univalue_a_SOURCES) if TARGET_WINDOWS bitcoind_SOURCES += bitcoind-res.rc +libbitcoind_la_SOURCES += bitcoind-res.rc endif bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) bitcoind_CPPFLAGS = $(BITCOIN_INCLUDES) bitcoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +libbitcoind_la_LIBADD = $(BOOST_LIBS) $(SSL_LIBS) $(LIBSECP256K1) $(CRYPTO_LIBS) leveldb/$(MEMOBJ) +libbitcoind_la_CPPFLAGS = $(BITCOIN_INCLUDES) +libbitcoind_la_LDFLAGS = -lleveldb -L./leveldb $(RELDFLAGS) -no-undefined +libbitcoind_la_DEPENDENCIES = $(LIBSECP256K1) LIBLEVELDB_SHARED $(MEMOBJ) # bitcoin-cli binary # bitcoin_cli_LDADD = \ diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index be7757b..0eb62d8 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -15,6 +15,9 @@ #include #include +#if ENABLE_DAEMONLIB +extern void DetectShutdownThread(boost::thread_group* threadGroup); +#endif /* Introduction text for doxygen: */ /*! \mainpage Developer documentation @@ -175,6 +178,7 @@ bool AppInit(int argc, char* argv[]) return fRet; } +#if !ENABLE_DAEMONLIB int main(int argc, char* argv[]) { SetupEnvironment(); @@ -184,3 +188,4 @@ int main(int argc, char* argv[]) return (AppInit(argc, argv) ? 0 : 1); } +#endif diff --git a/src/init.h b/src/init.h index f2f7ac6..9106580 100644 --- a/src/init.h +++ b/src/init.h @@ -17,6 +17,11 @@ class thread_group; extern CWallet* pwalletMain; +#if ENABLE_DAEMONLIB +#include +#include +#endif + void StartShutdown(); bool ShutdownRequested(); void Shutdown(); diff --git a/src/leveldb/Makefile b/src/leveldb/Makefile index 2bd2cad..490ba66 100644 --- a/src/leveldb/Makefile +++ b/src/leveldb/Makefile @@ -103,7 +103,7 @@ check: all $(PROGRAMS) $(TESTS) for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done clean: - -rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk + -rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) */*.o */*/*.lo helpers/memenv/.deps/*.Plo helpers/memenv/.deps/*.Tpo */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk -rm -rf ios-x86/* ios-arm/* $(LIBRARY): $(LIBOBJECTS) @@ -192,6 +192,10 @@ $(MEMENVLIBRARY) : $(MEMENVOBJECTS) rm -f $@ $(AR) -rs $@ $(MEMENVOBJECTS) +helpers/memenv/memenv.lo: helpers/memenv/memenv.cc + -mkdir -p helpers/memenv/.deps + /bin/bash ../../libtool --tag=CXX --mode=compile $(CXX) $(CXXFLAGS) $(CFLAGS) -fPIC -MT $@ -MD -MP -MF helpers/memenv/.deps/memenv.Tpo -c -o $@ $< + memenv_test : helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHARNESS) $(CXX) $(LDFLAGS) helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHARNESS) -o $@ $(LIBS) diff --git a/src/leveldbwrapper.h b/src/leveldbwrapper.h index 4247920..c75c63c 100644 --- a/src/leveldbwrapper.h +++ b/src/leveldbwrapper.h @@ -29,10 +29,16 @@ class CLevelDBBatch { friend class CLevelDBWrapper; +#if ENABLE_DAEMONLIB +public: +#else private: +#endif leveldb::WriteBatch batch; +#if !ENABLE_DAEMONLIB public: +#endif template void Write(const K& key, const V& value) { @@ -63,7 +69,11 @@ public: class CLevelDBWrapper { +#if ENABLE_DAEMONLIB +public: +#else private: +#endif //! custom environment this database is using (may be NULL in case of default environment) leveldb::Env* penv; @@ -85,7 +95,9 @@ private: //! the database itself leveldb::DB* pdb; +#if !ENABLE_DAEMONLIB public: +#endif CLevelDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, bool fMemory = false, bool fWipe = false); ~CLevelDBWrapper(); -- 2.3.2 (Apple Git-55)