diff --git a/make/defs.mk b/make/defs.mk index 315081b9..f1620dfc 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -109,8 +109,8 @@ else endif endif -CFLAGS += -Wall -Wno-unused-value -fexceptions -CPPFLAGS += -Wall -Wno-unused-value +CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions +CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value LDFLAGS += -Wall ifeq ($(CATCH_ONLY_YERROR),true) @@ -816,6 +816,18 @@ INCLUDE += -I$(FEEDFS_FMEMFS_DIR)/include LIBFLAGS += -L$(FEEDFS_FMEMFS_DIR)/lib -lfeedfs-fmemfs endif +ifeq ($(USE_FEEDFS_SYSLOG),true) +FEEDFS_SYSLOG_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-syslog /opt/$(FLAVOUR_PATH_PREFIX)feedfs-syslog)) +FEEDFS_SYSLOG_VERSION = $(call version,$(FEEDFS_SYSLOG_DIR)) +RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-syslog-run = $(FEEDFS_SYSLOG_VERSION) +RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-syslog-devel = $(FEEDFS_SYSLOG_VERSION) +USE_FEEDFS = true +# no build-time linkage necessary, no headers exported +LD_LIB_PATH += $(FEEDFS_SYSLOG_DIR)/lib +INCLUDE += -I$(FEEDFS_SYSLOG_DIR)/include +LIBFLAGS += -L$(FEEDFS_SYSLOG_DIR)/lib -lfeedfs-syslog +endif + ifeq ($(USE_FEEDFS_OBJECTS),true) FEEDFS_OBJECTS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-objects /opt/$(FLAVOUR_PATH_PREFIX)feedfs-objects)) FEEDFS_OBJECTS_VERSION = $(call version,$(FEEDFS_OBJECTS_DIR))