Skip to content

Commit 17ae260

Browse files
committed
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.
1 parent 6419bdf commit 17ae260

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
@@ -1225,14 +1225,6 @@ if test "x$have_any_system" != "xno"; then
12251225
AC_DEFINE(HAVE_SYSTEM, 1, Define to 1 if std::system or ::wsystem is available.)
12261226
fi
12271227

1228-
LEVELDB_CPPFLAGS=
1229-
LIBLEVELDB=
1230-
LIBMEMENV=
1231-
AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
1232-
AC_SUBST(LEVELDB_CPPFLAGS)
1233-
AC_SUBST(LIBLEVELDB)
1234-
AC_SUBST(LIBMEMENV)
1235-
12361228
dnl SUPPRESSED_CPPFLAGS=SUPPRESS_WARNINGS([$SOME_CPPFLAGS])
12371229
dnl Replace -I with -isystem in $SOME_CPPFLAGS to suppress warnings from
12381230
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
@@ -852,11 +852,8 @@ nodist_libbitcoin_ipc_a_SOURCES = $(libbitcoin_ipc_mpgen_output)
852852
CLEANFILES += $(libbitcoin_ipc_mpgen_output)
853853
endif
854854

855-
if EMBEDDED_LEVELDB
856855
include Makefile.crc32c.include
857856
include Makefile.leveldb.include
858-
endif
859-
860857
include Makefile.test_util.include
861858
include Makefile.test_fuzz.include
862859

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)