From: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx> Teach the Makefile to take STRUCTURED_LOGGING=1 variable to compile in/out structured logging feature. Signed-off-by: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx> --- Makefile | 8 ++++++++ structured-logging.c | 9 +++++++++ structured-logging.h | 13 +++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 structured-logging.c create mode 100644 structured-logging.h diff --git a/Makefile b/Makefile index 39ca66b..ccc39bf 100644 --- a/Makefile +++ b/Makefile @@ -442,6 +442,8 @@ all:: # When cross-compiling, define HOST_CPU as the canonical name of the CPU on # which the built Git will run (for instance "x86_64"). # +# Define STRUCTURED_LOGGING if you want structured logging to be available. +# # Define RUNTIME_PREFIX to configure Git to resolve its ancillary tooling and # support files relative to the location of the runtime binary, rather than # hard-coding them into the binary. Git installations built with RUNTIME_PREFIX @@ -955,6 +957,7 @@ LIB_OBJS += split-index.o LIB_OBJS += strbuf.o LIB_OBJS += streaming.o LIB_OBJS += string-list.o +LIB_OBJS += structured-logging.o LIB_OBJS += submodule.o LIB_OBJS += submodule-config.o LIB_OBJS += sub-process.o @@ -1326,6 +1329,10 @@ ifdef ZLIB_PATH endif EXTLIBS += -lz +ifdef STRUCTURED_LOGGING + BASIC_CFLAGS += -DSTRUCTURED_LOGGING +endif + ifndef NO_OPENSSL OPENSSL_LIBSSL = -lssl ifdef OPENSSLDIR @@ -2543,6 +2550,7 @@ GIT-BUILD-OPTIONS: FORCE @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@+ @echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@+ @echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@+ + @echo STRUCTURED_LOGGING=\''$(subst ','\'',$(subst ','\'',$(STRUCTURED_LOGGING)))'\' >>$@+ @echo USE_LIBPCRE1=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE1)))'\' >>$@+ @echo USE_LIBPCRE2=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE2)))'\' >>$@+ @echo NO_LIBPCRE1_JIT=\''$(subst ','\'',$(subst ','\'',$(NO_LIBPCRE1_JIT)))'\' >>$@+ diff --git a/structured-logging.c b/structured-logging.c new file mode 100644 index 0000000..702fd84 --- /dev/null +++ b/structured-logging.c @@ -0,0 +1,9 @@ +#if !defined(STRUCTURED_LOGGING) +/* + * Structured logging is not available. + * Stub out all API routines. + */ + +#else + +#endif diff --git a/structured-logging.h b/structured-logging.h new file mode 100644 index 0000000..c9e8c1d --- /dev/null +++ b/structured-logging.h @@ -0,0 +1,13 @@ +#ifndef STRUCTURED_LOGGING_H +#define STRUCTURED_LOGGING_H + +#if !defined(STRUCTURED_LOGGING) +/* + * Structured logging is not available. + * Stub out all API routines. + */ + +#else + +#endif /* STRUCTURED_LOGGING */ +#endif /* STRUCTURED_LOGGING_H */ -- 2.9.3
