Skip to content

Commit 64caf94

Browse files
committed
build: Remove vestigial LIBLEVELDB_SSE42
- LIBLEVELDB_SSE42_INT was defined, but never referenced anywhere - LIBLEVELDB_SSE42 is referenced, but never defined anywhere Apparently leveldb used to have platform-specific crc32 code before it got split off into a separate lib.
1 parent 1392e8e commit 64caf94

File tree

6 files changed

+3
-8
lines changed

6 files changed

+3
-8
lines changed

src/Makefile.am

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,6 @@ bitcoin_bin_ldadd = \
681681
$(LIBBITCOIN_CONSENSUS) \
682682
$(LIBBITCOIN_CRYPTO) \
683683
$(LIBLEVELDB) \
684-
$(LIBLEVELDB_SSE42) \
685684
$(LIBMEMENV) \
686685
$(LIBSECP256K1)
687686

@@ -868,7 +867,6 @@ bitcoin_chainstate_LDADD = \
868867
$(LIBUNIVALUE) \
869868
$(LIBSECP256K1) \
870869
$(LIBLEVELDB) \
871-
$(LIBLEVELDB_SSE42) \
872870
$(LIBMEMENV)
873871

874872
# Required for obj/build.h to be generated first.

src/Makefile.bench.include

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ bench_bench_bitcoin_LDADD = \
6060
$(LIBBITCOIN_CONSENSUS) \
6161
$(LIBBITCOIN_CRYPTO) \
6262
$(LIBLEVELDB) \
63-
$(LIBLEVELDB_SSE42) \
6463
$(LIBMEMENV) \
6564
$(LIBSECP256K1) \
6665
$(LIBUNIVALUE) \

src/Makefile.crc32c.include

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
LIBCRC32C_INT = crc32c/libcrc32c.a
6-
LIBLEVELDB_SSE42_INT = leveldb/libleveldb_sse42.a
76

87
EXTRA_LIBRARIES += $(LIBCRC32C_INT)
98

src/Makefile.qt.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ endif
330330
if ENABLE_ZMQ
331331
bitcoin_qt_ldadd += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
332332
endif
333-
bitcoin_qt_ldadd += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
333+
bitcoin_qt_ldadd += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
334334
$(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(LIBSECP256K1) \
335335
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(SQLITE_LIBS)
336336
bitcoin_qt_ldflags = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)

src/Makefile.qttest.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if ENABLE_ZMQ
5555
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
5656
endif
5757
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \
58-
$(LIBLEVELDB_SSE42) $(LIBMEMENV) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
58+
$(LIBMEMENV) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
5959
$(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(LIBSECP256K1) \
6060
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(SQLITE_LIBS)
6161
qt_test_test_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)

src/Makefile.test.include

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ FUZZ_SUITE_LD_COMMON = \
4747
$(LIBBITCOIN_CLI) \
4848
$(LIBUNIVALUE) \
4949
$(LIBLEVELDB) \
50-
$(LIBLEVELDB_SSE42) \
5150
$(LIBMEMENV) \
5251
$(LIBSECP256K1) \
5352
$(MINISKETCH_LIBS) \
@@ -204,7 +203,7 @@ test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
204203
endif
205204

206205
test_test_bitcoin_LDADD += $(LIBBITCOIN_NODE) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \
207-
$(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) $(MINISKETCH_LIBS)
206+
$(LIBLEVELDB) $(LIBMEMENV) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) $(MINISKETCH_LIBS)
208207
test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
209208

210209
test_test_bitcoin_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS)

0 commit comments

Comments
 (0)