Build judy even without dbengine (#13703)
always build judy
Timotej S committed
Sep 22, 2022 at 17:31 UTC
06368384c10e81d15b2c5408cfeff0a29f65b47f
2 files changed
+48
-54
Makefile.am
+47
-52
@@ -480,65 +480,65 @@ RRD_PLUGIN_FILES = \
480
database/sqlite/sqlite3.$(OBJEXT) : CFLAGS += -Wno-cast-function-type
481
database/KolmogorovSmirnovDist.$(OBJEXT) : CFLAGS += -Wno-maybe-uninitialized
482
483
-if ENABLE_DBENGINE
484
- noinst_LIBRARIES = libjudy.a
485
-
486
- libjudy_a_SOURCES = libnetdata/libjudy/src/Judy.h \
487
- libnetdata/libjudy/src/JudyCommon/JudyMalloc.c \
488
- libnetdata/libjudy/src/JudyCommon/JudyPrivate.h \
489
- libnetdata/libjudy/src/JudyCommon/JudyPrivate1L.h \
490
- libnetdata/libjudy/src/JudyCommon/JudyPrivateBranch.h \
491
- libnetdata/libjudy/src/JudyL/JudyL.h \
492
- libnetdata/libjudy/src/JudyL/JudyLByCount.c \
493
- libnetdata/libjudy/src/JudyL/JudyLCascade.c \
494
- libnetdata/libjudy/src/JudyL/JudyLCount.c \
495
- libnetdata/libjudy/src/JudyL/JudyLCreateBranch.c \
496
- libnetdata/libjudy/src/JudyL/JudyLDecascade.c \
497
- libnetdata/libjudy/src/JudyL/JudyLDel.c \
498
- libnetdata/libjudy/src/JudyL/JudyLFirst.c \
499
- libnetdata/libjudy/src/JudyL/JudyLFreeArray.c \
500
- libnetdata/libjudy/src/JudyL/j__udyLGet.c \
501
- libnetdata/libjudy/src/JudyL/JudyLGet.c \
502
- libnetdata/libjudy/src/JudyL/JudyLInsArray.c \
503
- libnetdata/libjudy/src/JudyL/JudyLIns.c \
504
- libnetdata/libjudy/src/JudyL/JudyLInsertBranch.c \
505
- libnetdata/libjudy/src/JudyL/JudyLMallocIF.c \
506
- libnetdata/libjudy/src/JudyL/JudyLMemActive.c \
507
- libnetdata/libjudy/src/JudyL/JudyLMemUsed.c \
508
- libnetdata/libjudy/src/JudyL/JudyLNext.c \
509
- libnetdata/libjudy/src/JudyL/JudyLNextEmpty.c \
510
- libnetdata/libjudy/src/JudyL/JudyLPrev.c \
511
- libnetdata/libjudy/src/JudyL/JudyLPrevEmpty.c \
512
- libnetdata/libjudy/src/JudyHS/JudyHS.c \
513
- $(NULL)
483
+noinst_LIBRARIES = libjudy.a
484
+
485
+libjudy_a_SOURCES = libnetdata/libjudy/src/Judy.h \
486
+ libnetdata/libjudy/src/JudyCommon/JudyMalloc.c \
487
+ libnetdata/libjudy/src/JudyCommon/JudyPrivate.h \
488
+ libnetdata/libjudy/src/JudyCommon/JudyPrivate1L.h \
489
+ libnetdata/libjudy/src/JudyCommon/JudyPrivateBranch.h \
490
+ libnetdata/libjudy/src/JudyL/JudyL.h \
491
+ libnetdata/libjudy/src/JudyL/JudyLByCount.c \
492
+ libnetdata/libjudy/src/JudyL/JudyLCascade.c \
493
+ libnetdata/libjudy/src/JudyL/JudyLCount.c \
494
+ libnetdata/libjudy/src/JudyL/JudyLCreateBranch.c \
495
+ libnetdata/libjudy/src/JudyL/JudyLDecascade.c \
496
+ libnetdata/libjudy/src/JudyL/JudyLDel.c \
497
+ libnetdata/libjudy/src/JudyL/JudyLFirst.c \
498
+ libnetdata/libjudy/src/JudyL/JudyLFreeArray.c \
499
+ libnetdata/libjudy/src/JudyL/j__udyLGet.c \
500
+ libnetdata/libjudy/src/JudyL/JudyLGet.c \
501
+ libnetdata/libjudy/src/JudyL/JudyLInsArray.c \
502
+ libnetdata/libjudy/src/JudyL/JudyLIns.c \
503
+ libnetdata/libjudy/src/JudyL/JudyLInsertBranch.c \
504
+ libnetdata/libjudy/src/JudyL/JudyLMallocIF.c \
505
+ libnetdata/libjudy/src/JudyL/JudyLMemActive.c \
506
+ libnetdata/libjudy/src/JudyL/JudyLMemUsed.c \
507
+ libnetdata/libjudy/src/JudyL/JudyLNext.c \
508
+ libnetdata/libjudy/src/JudyL/JudyLNextEmpty.c \
509
+ libnetdata/libjudy/src/JudyL/JudyLPrev.c \
510
+ libnetdata/libjudy/src/JudyL/JudyLPrevEmpty.c \
511
+ libnetdata/libjudy/src/JudyHS/JudyHS.c \
512
+ $(NULL)
513
515
- nodist_libjudy_a_SOURCES = JudyLTables.c
514
+nodist_libjudy_a_SOURCES = JudyLTables.c
515
517
- BUILT_SOURCES += JudyLTables.c
516
+BUILT_SOURCES += JudyLTables.c
517
519
- CLEANFILES += JudyLTables.c
518
+CLEANFILES += JudyLTables.c
519
521
- 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
520
+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
521
523
- libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrev.$(OBJEXT) : CFLAGS += -DJUDYPREV
524
- libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrevEmpty.$(OBJEXT) : CFLAGS += -DJUDYPREV
525
- libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNext.$(OBJEXT) : CFLAGS += -DJUDYNEXT
526
- libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNextEmpty.$(OBJEXT) : CFLAGS += -DJUDYNEXT
527
- libnetdata/libjudy/src/JudyL/libjudy_a-JudyLByCount.$(OBJEXT) : CFLAGS += -DNOSMARTJBB -DNOSMARTJBU -DNOSMARTJLB
528
- libnetdata/libjudy/src/JudyL/libjudy_a-j__udyLGet.$(OBJEXT) : CFLAGS += -DJUDYGETINLINE
522
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrev.$(OBJEXT) : CFLAGS += -DJUDYPREV
523
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrevEmpty.$(OBJEXT) : CFLAGS += -DJUDYPREV
524
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNext.$(OBJEXT) : CFLAGS += -DJUDYNEXT
525
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNextEmpty.$(OBJEXT) : CFLAGS += -DJUDYNEXT
526
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLByCount.$(OBJEXT) : CFLAGS += -DNOSMARTJBB -DNOSMARTJBU -DNOSMARTJLB
527
+libnetdata/libjudy/src/JudyL/libjudy_a-j__udyLGet.$(OBJEXT) : CFLAGS += -DJUDYGETINLINE
528
530
- noinst_PROGRAMS = judyltablesgen
529
+noinst_PROGRAMS = judyltablesgen
530
532
- judyltablesgen_SOURCES = libnetdata/libjudy/src/JudyL/JudyLTablesGen.c
533
- 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
531
+judyltablesgen_SOURCES = libnetdata/libjudy/src/JudyL/JudyLTablesGen.c
532
+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
533
535
- judyltablesgen$(EXEEXT) : CFLAGS += -Wno-format -Wno-format-security
534
+$(builddir)/judyltablesgen$(EXEEXT) : CFLAGS += -Wno-format -Wno-format-security
535
536
JudyLTables.c: $(abs_top_srcdir)/libnetdata/libjudy/src/JudyL/JudyLTablesGen.c $(builddir)/judyltablesgen$(EXEEXT)
537
$(builddir)/judyltablesgen$(EXEEXT)
538
540
- libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyL
539
+libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyL
540
541
+if ENABLE_DBENGINE
542
RRD_PLUGIN_FILES += \
543
database/engine/rrdengine.c \
544
database/engine/rrdengine.h \
@@ -1002,17 +1002,12 @@ NETDATA_COMMON_LIBS = \
1002
$(OPTIONAL_MQTT_LIBS) \
1003
$(OPTIONAL_UV_LIBS) \
1004
$(OPTIONAL_LZ4_LIBS) \
1005
- $(OPTIONAL_JUDY_LIBS) \
1005
+ libjudy.a \
1006
$(OPTIONAL_SSL_LIBS) \
1007
$(OPTIONAL_JSONC_LIBS) \
1008
$(OPTIONAL_ATOMIC_LIBS) \
1009
$(NULL)
1010
1011
-if ENABLE_DBENGINE
1012
- NETDATA_COMMON_LIBS += libjudy.a \
1013
- $(NULL)
1014
-endif
1015
-
1011
if LINK_STATIC_JSONC
1012
NETDATA_COMMON_LIBS += $(abs_top_srcdir)/externaldeps/jsonc/libjson-c.a
1013
endif
configure.ac
+1
-2
@@ -498,7 +498,6 @@ if test "${enable_dbengine}" != "no" -a "${UV_LIBS}" -a "${LZ4_LIBS}" -a "${SSL_
498
AC_DEFINE([ENABLE_DBENGINE], [1], [netdata dbengine usability])
499
OPTIONAL_LZ4_CFLAGS="${LZ4_CFLAGS}"
500
OPTIONAL_LZ4_LIBS="${LZ4_LIBS}"
501
- OPTIONAL_JUDY_CFLAGS="${JUDY_CFLAGS}"
501
OPTIONAL_SSL_CFLAGS="${SSL_CFLAGS}"
502
OPTIONAL_SSL_LIBS="${SSL_LIBS}"
503
else
@@ -1557,7 +1556,7 @@ CFLAGS="${originalCFLAGS} ${OPTIONAL_LTO_CFLAGS} ${OPTIONAL_PROTOBUF_CFLAGS} ${O
1556
${OPTIONAL_ZLIB_CFLAGS} ${OPTIONAL_UUID_CFLAGS} \
1557
${OPTIONAL_LIBCAP_CFLAGS} ${OPTIONAL_IPMIMONITORING_CFLAGS} ${OPTIONAL_CUPS_CFLAGS} ${OPTIONAL_XENSTAT_FLAGS} \
1558
${OPTIONAL_KINESIS_CFLAGS} ${OPTIONAL_PUBSUB_CFLAGS} ${OPTIONAL_PROMETHEUS_REMOTE_WRITE_CFLAGS} \
1560
- ${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS} ${OPTIONAL_JSONC_STATIC_CFLAGS} ${OPTIONAL_BPF_CFLAGS} ${OPTIONAL_JUDY_CFLAGS} \
1559
+ ${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS} ${OPTIONAL_JSONC_STATIC_CFLAGS} ${OPTIONAL_BPF_CFLAGS} ${JUDY_CFLAGS} \
1560
${OPTIONAL_ACLK_CFLAGS} ${OPTIONAL_ML_CFLAGS} ${OPTIONAL_ML_TESTS_CFLAGS} ${OPTIONAL_OS_DEP_CFLAGS}"
1561
1562
CXXFLAGS="${CFLAGS} ${CXX11FLAG}"