diff options
author | Haru <haru@dotalux.com> | 2019-12-15 18:04:50 +0100 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2020-03-30 06:35:10 +0300 |
commit | 8578597b71e94cbd599eb211665b1f6a2dbc2bb0 (patch) | |
tree | 8fdad8cc7a8f9a46c0afbef0cd0a5374e78fe88b /src | |
parent | 960d13887d7e1e4d14ae68d72163d639590673b5 (diff) | |
download | hercules-8578597b71e94cbd599eb211665b1f6a2dbc2bb0.tar.gz hercules-8578597b71e94cbd599eb211665b1f6a2dbc2bb0.tar.bz2 hercules-8578597b71e94cbd599eb211665b1f6a2dbc2bb0.tar.xz hercules-8578597b71e94cbd599eb211665b1f6a2dbc2bb0.zip |
Disable libbacktrace by default
It's currently only tested on linux, and doesn't work yet on macOS (tested on 10.15). Further work is necessary
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/char/Makefile.in | 18 | ||||
-rw-r--r-- | src/common/Makefile.in | 18 | ||||
-rw-r--r-- | src/login/Makefile.in | 18 | ||||
-rw-r--r-- | src/map/Makefile.in | 18 | ||||
-rw-r--r-- | src/test/Makefile.in | 18 |
5 files changed, 60 insertions, 30 deletions
diff --git a/src/char/Makefile.in b/src/char/Makefile.in index dc687d589..88a99c96c 100644 --- a/src/char/Makefile.in +++ b/src/char/Makefile.in @@ -36,12 +36,18 @@ LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \ scanctx.h scanner.h strbuf.h wincompat.h) -LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace -LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \ - dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \ - simple.o sort.o state.o) -LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \ - backtrace-supported.h config.h filenames.h internal.h) +ifeq (@USE_LIBBACKTRACE@,yes) + LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace + LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \ + dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \ + simple.o sort.o state.o) + LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \ + backtrace-supported.h config.h filenames.h internal.h) +else + LIBBACKTRACE_D = + LIBBACKTRACE_OBJ = + LIBBACKTRACE_H = +endif MT19937AR_D = $(THIRDPARTY_D)/mt19937ar MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o diff --git a/src/common/Makefile.in b/src/common/Makefile.in index 97ba34775..22b974cfd 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -33,12 +33,18 @@ LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \ scanctx.h scanner.h strbuf.h wincompat.h) -LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace -LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \ - dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \ - simple.o sort.o state.o) -LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \ - backtrace-supported.h config.h filenames.h internal.h) +ifeq (@USE_LIBBACKTRACE@,yes) + LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace + LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \ + dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \ + simple.o sort.o state.o) + LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \ + backtrace-supported.h config.h filenames.h internal.h) +else + LIBBACKTRACE_D = + LIBBACKTRACE_OBJ = + LIBBACKTRACE_H = +endif MT19937AR_D = $(THIRDPARTY_D)/mt19937ar MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o diff --git a/src/login/Makefile.in b/src/login/Makefile.in index 4f180070c..7252eea04 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -36,12 +36,18 @@ LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \ scanctx.h scanner.h strbuf.h wincompat.h) -LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace -LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \ - dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \ - simple.o sort.o state.o) -LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \ - backtrace-supported.h config.h filenames.h internal.h) +ifeq (@USE_LIBBACKTRACE@,yes) + LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace + LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \ + dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \ + simple.o sort.o state.o) + LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \ + backtrace-supported.h config.h filenames.h internal.h) +else + LIBBACKTRACE_D = + LIBBACKTRACE_OBJ = + LIBBACKTRACE_H = +endif MT19937AR_D = $(THIRDPARTY_D)/mt19937ar MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o diff --git a/src/map/Makefile.in b/src/map/Makefile.in index 2b050e99c..75093662f 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -36,12 +36,18 @@ LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \ scanctx.h scanner.h strbuf.h wincompat.h) -LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace -LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \ - dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \ - simple.o sort.o state.o) -LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \ - backtrace-supported.h config.h filenames.h internal.h) +ifeq (@USE_LIBBACKTRACE@,yes) + LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace + LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \ + dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \ + simple.o sort.o state.o) + LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \ + backtrace-supported.h config.h filenames.h internal.h) +else + LIBBACKTRACE_D = + LIBBACKTRACE_OBJ = + LIBBACKTRACE_H = +endif MT19937AR_D = $(THIRDPARTY_D)/mt19937ar MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o diff --git a/src/test/Makefile.in b/src/test/Makefile.in index 967d7dcfc..91263c939 100644 --- a/src/test/Makefile.in +++ b/src/test/Makefile.in @@ -36,12 +36,18 @@ LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \ scanctx.h scanner.h strbuf.h wincompat.h) -LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace -LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \ - dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \ - simple.o sort.o state.o) -LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \ - backtrace-supported.h config.h filenames.h internal.h) +ifeq (@USE_LIBBACKTRACE@,yes) + LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace + LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \ + dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \ + simple.o sort.o state.o) + LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \ + backtrace-supported.h config.h filenames.h internal.h) +else + LIBBACKTRACE_D = + LIBBACKTRACE_OBJ = + LIBBACKTRACE_H = +endif MT19937AR_D = $(THIRDPARTY_D)/mt19937ar MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o |