Skip to content

Commit 4229f71

Browse files
committed
Merge bitcoin/bitcoin#23282: build: remove build stubs for external leveldb
17ae260 build: remove build stubs for external leveldb (Cory Fields) Pull request description: Presumably these stubs indicate to packagers that external leveldb is meant to be supported in some way. It is not. Remove the stubs to avoid sending any mixed messages. For context, this was reported on IRC: > \<Talkless> bitcoind fails to start with undefined symbol: _ZTIN7leveldb6LoggerE in Debian Sid after leveldb upgraded from 1.22 to 1.23: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996486 ACKs for top commit: fanquake: ACK 17ae260 hebasto: ACK 17ae260. I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 2f1ac2cb30dac64791933a245a2b66ce237bde3955e6f4a6b7ec181248f77a9b1b10597d865d3e2c2b6def696af70de40e905ec274e4ae7cccd1daf461473957
2 parents 69986de + 17ae260 commit 4229f71

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

configure.ac

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,14 +1219,6 @@ if test "x$have_any_system" != "xno"; then
12191219
AC_DEFINE(HAVE_SYSTEM, 1, Define to 1 if std::system or ::wsystem is available.)
12201220
fi
12211221

1222-
LEVELDB_CPPFLAGS=
1223-
LIBLEVELDB=
1224-
LIBMEMENV=
1225-
AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
1226-
AC_SUBST(LEVELDB_CPPFLAGS)
1227-
AC_SUBST(LIBLEVELDB)
1228-
AC_SUBST(LIBMEMENV)
1229-
12301222
dnl SUPPRESSED_CPPFLAGS=SUPPRESS_WARNINGS([$SOME_CPPFLAGS])
12311223
dnl Replace -I with -isystem in $SOME_CPPFLAGS to suppress warnings from
12321224
dnl headers from its include directories and return the result.

src/Makefile.am

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -841,11 +841,8 @@ nodist_libbitcoin_ipc_a_SOURCES = $(libbitcoin_ipc_mpgen_output)
841841
CLEANFILES += $(libbitcoin_ipc_mpgen_output)
842842
endif
843843

844-
if EMBEDDED_LEVELDB
845844
include Makefile.crc32c.include
846845
include Makefile.leveldb.include
847-
endif
848-
849846
include Makefile.test_util.include
850847
include Makefile.test_fuzz.include
851848

src/Makefile.leveldb.include

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ LIBMEMENV_INT = leveldb/libmemenv.a
88
EXTRA_LIBRARIES += $(LIBLEVELDB_INT)
99
EXTRA_LIBRARIES += $(LIBMEMENV_INT)
1010

11-
LIBLEVELDB += $(LIBLEVELDB_INT) $(LIBCRC32C)
12-
LIBMEMENV += $(LIBMEMENV_INT)
11+
LIBLEVELDB = $(LIBLEVELDB_INT) $(LIBCRC32C)
12+
LIBMEMENV = $(LIBMEMENV_INT)
1313

14+
LEVELDB_CPPFLAGS =
1415
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include
1516
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
1617

0 commit comments

Comments
 (0)