janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs.mk: Add FEEDFS_SYSLOG, _FILE_OFFSET_BITS=64

Browse source 
- Add support for FEEDFS_SYSLOG
  - Add -D_FILE_OFFSET_BITS=64 to all CFLAGS and CPPFLAGS
This commit is contained in:
Jan Lindemann 2009-08-21 17:30:00 +00:00 • committed by Jan Lindemann
commit 81b09ed9b7
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
make/defs.mk
View file

@ -109,8 +109,8 @@ else
endif endif
endif endif
CFLAGS += -Wall -Wno-unused-value -fexceptions CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions
CPPFLAGS += -Wall -Wno-unused-value CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value
LDFLAGS += -Wall LDFLAGS += -Wall
ifeq ($(CATCH_ONLY_YERROR),true) ifeq ($(CATCH_ONLY_YERROR),true)
@ -816,6 +816,18 @@ INCLUDE += -I$(FEEDFS_FMEMFS_DIR)/include
LIBFLAGS += -L$(FEEDFS_FMEMFS_DIR)/lib -lfeedfs-fmemfs LIBFLAGS += -L$(FEEDFS_FMEMFS_DIR)/lib -lfeedfs-fmemfs
endif 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) ifeq ($(USE_FEEDFS_OBJECTS),true)
FEEDFS_OBJECTS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-objects /opt/$(FLAVOUR_PATH_PREFIX)feedfs-objects)) FEEDFS_OBJECTS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-objects /opt/$(FLAVOUR_PATH_PREFIX)feedfs-objects))
FEEDFS_OBJECTS_VERSION = $(call version,$(FEEDFS_OBJECTS_DIR)) FEEDFS_OBJECTS_VERSION = $(call version,$(FEEDFS_OBJECTS_DIR))