Build judy even without dbengine (#13703)

always build judy
2022-09-22 17:31:55 +02:00 · 2022-09-22 17:31:55 +02:00 · 06368384c1
parent 4453613cba
commit 06368384c1
2 changed files with 47 additions and 53 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -480,65 +480,65 @@ RRD_PLUGIN_FILES = \
 database/sqlite/sqlite3.$(OBJEXT) : CFLAGS += -Wno-cast-function-type
 database/KolmogorovSmirnovDist.$(OBJEXT) : CFLAGS += -Wno-maybe-uninitialized

-if ENABLE_DBENGINE
-    noinst_LIBRARIES = libjudy.a
+noinst_LIBRARIES = libjudy.a

-    libjudy_a_SOURCES = libnetdata/libjudy/src/Judy.h \
-        libnetdata/libjudy/src/JudyCommon/JudyMalloc.c \
-        libnetdata/libjudy/src/JudyCommon/JudyPrivate.h \
-        libnetdata/libjudy/src/JudyCommon/JudyPrivate1L.h \
-        libnetdata/libjudy/src/JudyCommon/JudyPrivateBranch.h \
-        libnetdata/libjudy/src/JudyL/JudyL.h \
-        libnetdata/libjudy/src/JudyL/JudyLByCount.c \
-        libnetdata/libjudy/src/JudyL/JudyLCascade.c \
-        libnetdata/libjudy/src/JudyL/JudyLCount.c \
-        libnetdata/libjudy/src/JudyL/JudyLCreateBranch.c \
-        libnetdata/libjudy/src/JudyL/JudyLDecascade.c \
-        libnetdata/libjudy/src/JudyL/JudyLDel.c \
-        libnetdata/libjudy/src/JudyL/JudyLFirst.c \
-        libnetdata/libjudy/src/JudyL/JudyLFreeArray.c \
-        libnetdata/libjudy/src/JudyL/j__udyLGet.c \
-        libnetdata/libjudy/src/JudyL/JudyLGet.c \
-        libnetdata/libjudy/src/JudyL/JudyLInsArray.c \
-        libnetdata/libjudy/src/JudyL/JudyLIns.c \
-        libnetdata/libjudy/src/JudyL/JudyLInsertBranch.c \
-        libnetdata/libjudy/src/JudyL/JudyLMallocIF.c \
-        libnetdata/libjudy/src/JudyL/JudyLMemActive.c \
-        libnetdata/libjudy/src/JudyL/JudyLMemUsed.c \
-        libnetdata/libjudy/src/JudyL/JudyLNext.c \
-        libnetdata/libjudy/src/JudyL/JudyLNextEmpty.c \
-        libnetdata/libjudy/src/JudyL/JudyLPrev.c \
-        libnetdata/libjudy/src/JudyL/JudyLPrevEmpty.c \
-        libnetdata/libjudy/src/JudyHS/JudyHS.c \
-        $(NULL)
+libjudy_a_SOURCES = libnetdata/libjudy/src/Judy.h \
+    libnetdata/libjudy/src/JudyCommon/JudyMalloc.c \
+    libnetdata/libjudy/src/JudyCommon/JudyPrivate.h \
+    libnetdata/libjudy/src/JudyCommon/JudyPrivate1L.h \
+    libnetdata/libjudy/src/JudyCommon/JudyPrivateBranch.h \
+    libnetdata/libjudy/src/JudyL/JudyL.h \
+    libnetdata/libjudy/src/JudyL/JudyLByCount.c \
+    libnetdata/libjudy/src/JudyL/JudyLCascade.c \
+    libnetdata/libjudy/src/JudyL/JudyLCount.c \
+    libnetdata/libjudy/src/JudyL/JudyLCreateBranch.c \
+    libnetdata/libjudy/src/JudyL/JudyLDecascade.c \
+    libnetdata/libjudy/src/JudyL/JudyLDel.c \
+    libnetdata/libjudy/src/JudyL/JudyLFirst.c \
+    libnetdata/libjudy/src/JudyL/JudyLFreeArray.c \
+    libnetdata/libjudy/src/JudyL/j__udyLGet.c \
+    libnetdata/libjudy/src/JudyL/JudyLGet.c \
+    libnetdata/libjudy/src/JudyL/JudyLInsArray.c \
+    libnetdata/libjudy/src/JudyL/JudyLIns.c \
+    libnetdata/libjudy/src/JudyL/JudyLInsertBranch.c \
+    libnetdata/libjudy/src/JudyL/JudyLMallocIF.c \
+    libnetdata/libjudy/src/JudyL/JudyLMemActive.c \
+    libnetdata/libjudy/src/JudyL/JudyLMemUsed.c \
+    libnetdata/libjudy/src/JudyL/JudyLNext.c \
+    libnetdata/libjudy/src/JudyL/JudyLNextEmpty.c \
+    libnetdata/libjudy/src/JudyL/JudyLPrev.c \
+    libnetdata/libjudy/src/JudyL/JudyLPrevEmpty.c \
+    libnetdata/libjudy/src/JudyHS/JudyHS.c \
+    $(NULL)

-    nodist_libjudy_a_SOURCES = JudyLTables.c
+nodist_libjudy_a_SOURCES = JudyLTables.c

-    BUILT_SOURCES += JudyLTables.c
+BUILT_SOURCES += JudyLTables.c

-    CLEANFILES += JudyLTables.c
+CLEANFILES += JudyLTables.c

-    libjudy_a_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough
+libjudy_a_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough

-    libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrev.$(OBJEXT) : CFLAGS += -DJUDYPREV
-    libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrevEmpty.$(OBJEXT) : CFLAGS += -DJUDYPREV
-    libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNext.$(OBJEXT) : CFLAGS += -DJUDYNEXT
-    libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNextEmpty.$(OBJEXT) : CFLAGS += -DJUDYNEXT
-    libnetdata/libjudy/src/JudyL/libjudy_a-JudyLByCount.$(OBJEXT) : CFLAGS +=  -DNOSMARTJBB -DNOSMARTJBU -DNOSMARTJLB
-    libnetdata/libjudy/src/JudyL/libjudy_a-j__udyLGet.$(OBJEXT) : CFLAGS +=  -DJUDYGETINLINE
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrev.$(OBJEXT) : CFLAGS += -DJUDYPREV
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrevEmpty.$(OBJEXT) : CFLAGS += -DJUDYPREV
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNext.$(OBJEXT) : CFLAGS += -DJUDYNEXT
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNextEmpty.$(OBJEXT) : CFLAGS += -DJUDYNEXT
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLByCount.$(OBJEXT) : CFLAGS +=  -DNOSMARTJBB -DNOSMARTJBU -DNOSMARTJLB
+libnetdata/libjudy/src/JudyL/libjudy_a-j__udyLGet.$(OBJEXT) : CFLAGS +=  -DJUDYGETINLINE

-    noinst_PROGRAMS = judyltablesgen
+noinst_PROGRAMS = judyltablesgen

-    judyltablesgen_SOURCES = libnetdata/libjudy/src/JudyL/JudyLTablesGen.c
-    judyltablesgen_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough
+judyltablesgen_SOURCES = libnetdata/libjudy/src/JudyL/JudyLTablesGen.c
+judyltablesgen_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough

-    judyltablesgen$(EXEEXT) : CFLAGS += -Wno-format -Wno-format-security
+$(builddir)/judyltablesgen$(EXEEXT) : CFLAGS += -Wno-format -Wno-format-security

 JudyLTables.c: $(abs_top_srcdir)/libnetdata/libjudy/src/JudyL/JudyLTablesGen.c $(builddir)/judyltablesgen$(EXEEXT)
 	$(builddir)/judyltablesgen$(EXEEXT)

-    libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyL
+libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyL

+if ENABLE_DBENGINE
    RRD_PLUGIN_FILES += \
        database/engine/rrdengine.c \
        database/engine/rrdengine.h \
@ -1002,17 +1002,12 @@ NETDATA_COMMON_LIBS = \
    $(OPTIONAL_MQTT_LIBS) \
    $(OPTIONAL_UV_LIBS) \
    $(OPTIONAL_LZ4_LIBS) \
-    $(OPTIONAL_JUDY_LIBS) \
+    libjudy.a \
    $(OPTIONAL_SSL_LIBS) \
    $(OPTIONAL_JSONC_LIBS) \
    $(OPTIONAL_ATOMIC_LIBS) \
    $(NULL)

-if ENABLE_DBENGINE
-    NETDATA_COMMON_LIBS += libjudy.a \
-    $(NULL)
-endif
-
 if LINK_STATIC_JSONC
    NETDATA_COMMON_LIBS += $(abs_top_srcdir)/externaldeps/jsonc/libjson-c.a
 endif
--- a/configure.ac
+++ b/configure.ac
@ -498,7 +498,6 @@ if test "${enable_dbengine}" != "no" -a "${UV_LIBS}" -a "${LZ4_LIBS}" -a "${SSL_
    AC_DEFINE([ENABLE_DBENGINE], [1], [netdata dbengine usability])
    OPTIONAL_LZ4_CFLAGS="${LZ4_CFLAGS}"
    OPTIONAL_LZ4_LIBS="${LZ4_LIBS}"
-    OPTIONAL_JUDY_CFLAGS="${JUDY_CFLAGS}"
    OPTIONAL_SSL_CFLAGS="${SSL_CFLAGS}"
    OPTIONAL_SSL_LIBS="${SSL_LIBS}"
 else
@ -1557,7 +1556,7 @@ CFLAGS="${originalCFLAGS} ${OPTIONAL_LTO_CFLAGS} ${OPTIONAL_PROTOBUF_CFLAGS} ${O
    ${OPTIONAL_ZLIB_CFLAGS} ${OPTIONAL_UUID_CFLAGS} \
    ${OPTIONAL_LIBCAP_CFLAGS} ${OPTIONAL_IPMIMONITORING_CFLAGS} ${OPTIONAL_CUPS_CFLAGS} ${OPTIONAL_XENSTAT_FLAGS} \
    ${OPTIONAL_KINESIS_CFLAGS} ${OPTIONAL_PUBSUB_CFLAGS} ${OPTIONAL_PROMETHEUS_REMOTE_WRITE_CFLAGS} \
-    ${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS} ${OPTIONAL_JSONC_STATIC_CFLAGS} ${OPTIONAL_BPF_CFLAGS} ${OPTIONAL_JUDY_CFLAGS} \
+    ${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS} ${OPTIONAL_JSONC_STATIC_CFLAGS} ${OPTIONAL_BPF_CFLAGS} ${JUDY_CFLAGS} \
    ${OPTIONAL_ACLK_CFLAGS} ${OPTIONAL_ML_CFLAGS} ${OPTIONAL_ML_TESTS_CFLAGS} ${OPTIONAL_OS_DEP_CFLAGS}"

 CXXFLAGS="${CFLAGS} ${CXX11FLAG}"