diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-01-19 14:54:39 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-01-19 14:54:39 -0800 |
| commit | 7612bf3302eef8a49658eaeca09504be588f6398 (patch) | |
| tree | 42ac2d18d0a081b304abebe8e4bbb083a2b5421b /make-linux.mk | |
| parent | ba158d8dc6d05db2fc330913d0ab76af1e306055 (diff) | |
| download | infinitytier-7612bf3302eef8a49658eaeca09504be588f6398.tar.gz infinitytier-7612bf3302eef8a49658eaeca09504be588f6398.zip | |
Fix LZ4 warning.
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/make-linux.mk b/make-linux.mk index cb91ab88..6f116bfc 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -14,20 +14,23 @@ DESTDIR?= include objects.mk -# On Linux we auto-detect the presence of some libraries and if present we -# link against the system version. This works with our package build images. -ifeq ($(wildcard /usr/include/lz4.h),) - OBJS+=ext/lz4/lz4.o -else - LDLIBS+=-llz4 - DEFS+=-DZT_USE_SYSTEM_LZ4 -endif -ifeq ($(wildcard /usr/include/http_parser.h),) - OBJS+=ext/http-parser/http_parser.o -else - LDLIBS+=-lhttp_parser - DEFS+=-DZT_USE_SYSTEM_HTTP_PARSER -endif +# Used to auto-detect these and use them if dev headers were present, but stopped +# since it caused too many damn problems. The http-parser library in particular +# is basically broken between versions. Fark the Debian policies about including +# libraries. It's better if things work. +#ifeq ($(wildcard /usr/include/lz4.h),) +# OBJS+=ext/lz4/lz4.o +#else +# LDLIBS+=-llz4 +# DEFS+=-DZT_USE_SYSTEM_LZ4 +#endif +#ifeq ($(wildcard /usr/include/http_parser.h),) +# OBJS+=ext/http-parser/http_parser.o +#else +# LDLIBS+=-lhttp_parser +# DEFS+=-DZT_USE_SYSTEM_HTTP_PARSER +#endif +OBJS+=ext/lz4/lz4.o ext/http-parser/http_parser.o # Auto-detect miniupnpc and nat-pmp as well and use system libs if present, # otherwise build into binary as done on Mac and Windows. |