diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-04-11 10:05:24 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-04-11 10:05:35 -0400 |
commit | a5623ba89f050182ce9b1f570f3736b272b544b2 (patch) | |
tree | c01051ff78f5a7c6bb1d942c4f87bf0d8bdb0778 /src | |
parent | 3eb8b1c3924c1d14c1a4234eb5360f32808b86dc (diff) | |
parent | f29bd546ec169dd9af2ca6265c76353e68db92be (diff) | |
download | bitcoin-a5623ba89f050182ce9b1f570f3736b272b544b2.tar.xz |
Merge #18588: Revert "Merge #16367: Multiprocess build support"
f29bd546ec169dd9af2ca6265c76353e68db92be Revert "Merge #16367: Multiprocess build support" (MarcoFalke)
Pull request description:
Reverting the changes temporarily is going to help with the following:
* Discussion about the next steps for the multiprocess concept and the experimental libmultiprocess library without having code already commited in the master branch, potentially influencing the discussion
* Allowing for more conceptual as well as code review ACKs to accumulate, since the pull only had one ACK (two if I count mine, which didn't make it to GitHub)
Can be reviewed with `git diff HEAD HEAD~2 | wc` or `git diff 1b307613604883daea4913a65da30ae073c9dc4d~ | wc` (should be all zeros)
Context here: https://github.com/bitcoin/bitcoin/pull/16367#issuecomment-612260496
ACKs for top commit:
ryanofsky:
Code review ACK f29bd546ec169dd9af2ca6265c76353e68db92be. Confirmed revert with
fanquake:
ACK f29bd546ec169dd9af2ca6265c76353e68db92be
Tree-SHA512: 3ce06c30de23c81c2d69cfb3ada20b3458c48efda1a5ba96aee678e946c499f701bc83e9eae91580f0156c0f30a90e5d015ef8b1806ad611d433c482fa55723e
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 57 | ||||
-rw-r--r-- | src/Makefile.qt.include | 43 |
2 files changed, 40 insertions, 60 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 33fae02a5a..f15852ac66 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -85,10 +85,6 @@ if BUILD_BITCOIND bin_PROGRAMS += bitcoind endif -if BUILD_BITCOIN_NODE - bin_PROGRAMS += bitcoin-node -endif - if BUILD_BITCOIN_CLI bin_PROGRAMS += bitcoin-cli endif @@ -550,22 +546,22 @@ libbitcoin_cli_a_SOURCES = \ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # -# bitcoind & bitcoin-node binaries # -bitcoin_common_sources = bitcoind.cpp -bitcoin_common_cppflags = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -bitcoin_common_cxxflags = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoin_common_ldflags = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# bitcoind binary # +bitcoind_SOURCES = bitcoind.cpp +bitcoind_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +bitcoind_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +bitcoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoin_common_sources += bitcoind-res.rc +bitcoind_SOURCES += bitcoind-res.rc endif -bitcoin_common_ldadd = \ +bitcoind_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_WALLET) \ $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ $(LIBUNIVALUE) \ + $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_ZMQ) \ $(LIBBITCOIN_CONSENSUS) \ $(LIBBITCOIN_CRYPTO) \ @@ -574,19 +570,7 @@ bitcoin_common_ldadd = \ $(LIBMEMENV) \ $(LIBSECP256K1) -bitcoin_common_ldadd += $(BOOST_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) - -bitcoind_SOURCES = $(bitcoin_common_sources) -bitcoind_CPPFLAGS = $(bitcoin_common_cppflags) -bitcoind_CXXFLAGS = $(bitcoin_common_cxxflags) -bitcoind_LDFLAGS = $(bitcoin_common_ldflags) -bitcoind_LDADD = $(bitcoin_common_ldadd) - -bitcoin_node_SOURCES = $(bitcoin_common_sources) -bitcoin_node_CPPFLAGS = $(bitcoin_common_cppflags) -bitcoin_node_CXXFLAGS = $(bitcoin_common_cxxflags) -bitcoin_node_LDFLAGS = $(bitcoin_common_ldflags) -bitcoin_node_LDADD = $(bitcoin_common_ldadd) +bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) # bitcoin-cli binary # bitcoin_cli_SOURCES = bitcoin-cli.cpp @@ -630,14 +614,29 @@ bitcoin_tx_LDADD += $(BOOST_LIBS) # bitcoin-wallet binary # bitcoin_wallet_SOURCES = bitcoin-wallet.cpp -bitcoin_wallet_CPPFLAGS = $(bitcoin_common_cppflags) -bitcoin_wallet_CXXFLAGS = $(bitcoin_common_cxxflags) -bitcoin_wallet_LDFLAGS = $(bitcoin_common_ldflags) -bitcoin_wallet_LDADD = $(LIBBITCOIN_WALLET_TOOL) $(bitcoin_common_ldadd) +bitcoin_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +bitcoin_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +bitcoin_wallet_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS bitcoin_wallet_SOURCES += bitcoin-wallet-res.rc endif + +bitcoin_wallet_LDADD = \ + $(LIBBITCOIN_WALLET_TOOL) \ + $(LIBBITCOIN_WALLET) \ + $(LIBBITCOIN_COMMON) \ + $(LIBBITCOIN_CONSENSUS) \ + $(LIBBITCOIN_UTIL) \ + $(LIBBITCOIN_CRYPTO) \ + $(LIBBITCOIN_ZMQ) \ + $(LIBLEVELDB) \ + $(LIBLEVELDB_SSE42) \ + $(LIBMEMENV) \ + $(LIBSECP256K1) \ + $(LIBUNIVALUE) + +bitcoin_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(MINIUPNPC_LIBS) $(ZMQ_LIBS) # # bitcoinconsensus library # diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 83dd56f2f0..cf09eee2cb 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -3,11 +3,6 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. bin_PROGRAMS += qt/bitcoin-qt - -if BUILD_BITCOIN_GUI - bin_PROGRAMS += bitcoin-gui -endif - EXTRA_LIBRARIES += qt/libbitcoinqt.a # bitcoin qt core # @@ -299,43 +294,29 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI: # Most files will depend on the forms and moc files as includes. Generate them # before anything else. $(QT_MOC): $(QT_FORMS_H) -$(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) $(bitcoin_gui_OBJECTS) : | $(QT_MOC) +$(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) : | $(QT_MOC) -# bitcoin-qt and bitcoin-gui binaries # -bitcoin_qt_common_cppflags = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +# bitcoin-qt binary # +qt_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QR_CFLAGS) -bitcoin_qt_common_cxxflags = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_bitcoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -bitcoin_qt_common_sources = qt/main.cpp +qt_bitcoin_qt_SOURCES = qt/main.cpp if TARGET_WINDOWS - bitcoin_qt_common_sources += $(BITCOIN_RC) + qt_bitcoin_qt_SOURCES += $(BITCOIN_RC) endif -bitcoin_qt_common_ldadd = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) +qt_bitcoin_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET -bitcoin_qt_common_ldadd += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET) +qt_bitcoin_qt_LDADD += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET) endif if ENABLE_ZMQ -bitcoin_qt_common_ldadd += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +qt_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) endif -bitcoin_qt_common_ldadd += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \ +qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) -bitcoin_qt_common_ldflags = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -bitcoin_qt_common_libtoolflags = $(AM_LIBTOOLFLAGS) --tag CXX - -qt_bitcoin_qt_CPPFLAGS = $(bitcoin_qt_common_cppflags) -qt_bitcoin_qt_CXXFLAGS = $(bitcoin_qt_common_cxxflags) -qt_bitcoin_qt_SOURCES = $(bitcoin_qt_common_sources) -qt_bitcoin_qt_LDADD = $(bitcoin_qt_common_ldadd) -qt_bitcoin_qt_LDFLAGS = $(bitcoin_qt_common_ldflags) -qt_bitcoin_qt_LIBTOOLFLAGS = $(bitcoin_qt_common_libtoolflags) - -bitcoin_gui_CPPFLAGS = $(bitcoin_qt_common_cppflags) -bitcoin_gui_CXXFLAGS = $(bitcoin_qt_common_cxxflags) -bitcoin_gui_SOURCES = $(bitcoin_qt_common_sources) -bitcoin_gui_LDADD = $(bitcoin_qt_common_ldadd) -bitcoin_gui_LDFLAGS = $(bitcoin_qt_common_ldflags) -bitcoin_gui_LIBTOOLFLAGS = $(bitcoin_qt_common_libtoolflags) +qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_bitcoin_qt_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS) --tag CXX #locale/foo.ts -> locale/foo.qm QT_QM=$(QT_TS:.ts=.qm) |