diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2021-10-14 19:33:06 +0000 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2021-10-15 01:02:45 +0000 |
| commit | 17ae2601c786e6863cee1bd62297d79521219295 (patch) | |
| tree | be08178da94fec2b7a9783a29918336c998c5eba | |
| parent | 6419bdfeb130b20ccfed229d9ba7eca7f385d036 (diff) | |
| download | bitcoin-17ae2601c786e6863cee1bd62297d79521219295.tar.xz | |
build: remove build stubs for external leveldb
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.
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.leveldb.include | 5 |
3 files changed, 3 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 9e9284015b..445ae22089 100644 --- a/configure.ac +++ b/configure.ac @@ -1225,14 +1225,6 @@ if test "x$have_any_system" != "xno"; then AC_DEFINE(HAVE_SYSTEM, 1, Define to 1 if std::system or ::wsystem is available.) fi -LEVELDB_CPPFLAGS= -LIBLEVELDB= -LIBMEMENV= -AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) -AC_SUBST(LEVELDB_CPPFLAGS) -AC_SUBST(LIBLEVELDB) -AC_SUBST(LIBMEMENV) - dnl SUPPRESSED_CPPFLAGS=SUPPRESS_WARNINGS([$SOME_CPPFLAGS]) dnl Replace -I with -isystem in $SOME_CPPFLAGS to suppress warnings from dnl headers from its include directories and return the result. diff --git a/src/Makefile.am b/src/Makefile.am index 9d15120b72..dd35dcfc70 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -852,11 +852,8 @@ nodist_libbitcoin_ipc_a_SOURCES = $(libbitcoin_ipc_mpgen_output) CLEANFILES += $(libbitcoin_ipc_mpgen_output) endif -if EMBEDDED_LEVELDB include Makefile.crc32c.include include Makefile.leveldb.include -endif - include Makefile.test_util.include include Makefile.test_fuzz.include diff --git a/src/Makefile.leveldb.include b/src/Makefile.leveldb.include index ce1f93f11f..3bec92482a 100644 --- a/src/Makefile.leveldb.include +++ b/src/Makefile.leveldb.include @@ -8,9 +8,10 @@ LIBMEMENV_INT = leveldb/libmemenv.a EXTRA_LIBRARIES += $(LIBLEVELDB_INT) EXTRA_LIBRARIES += $(LIBMEMENV_INT) -LIBLEVELDB += $(LIBLEVELDB_INT) $(LIBCRC32C) -LIBMEMENV += $(LIBMEMENV_INT) +LIBLEVELDB = $(LIBLEVELDB_INT) $(LIBCRC32C) +LIBMEMENV = $(LIBMEMENV_INT) +LEVELDB_CPPFLAGS = LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv |