X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdebian%2Frules;h=431f8985a6c4c289a468dc2b65d0862513b0b307;hb=a2ae8dfea31fc1495e3a97b28f3ddca01f491bef;hp=85489575c077f88c549fd83a25edcea05b6816db;hpb=3fbb5023c221ab297f39cf31ccaf2d70a76f0623;p=citadel.git diff --git a/citadel/debian/rules b/citadel/debian/rules index 85489575c..431f8985a 100755 --- a/citadel/debian/rules +++ b/citadel/debian/rules @@ -11,12 +11,12 @@ export DH_OPTIONS DEB_DESTDIR = $(CURDIR)/debian/tmp -CFLAGS = -Wall -g +CFLAGS = -Wall -g -Werror=format-security COMPILER= EXTRA_ARGS= PROFILE_ARGS= -#to enable debugging: export DEB_BUILD_OPTIONS="debug profiling threadoff rss gcov clang" +#to enable debugging: export DEB_BUILD_OPTIONS="debug profiling threadoff rss gcov clang cares" ifneq (,$(findstring clang,$(DEB_BUILD_OPTIONS))) COMPILER="clang" endif @@ -25,7 +25,7 @@ ifneq (,$(findstring profiling,$(DEB_BUILD_OPTIONS))) endif ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -ggdb -rdynamic -D_GNU_SOURCE -MD -MP -D TECH_PREVIEW + CFLAGS += -O0 -ggdb -rdynamic -D_GNU_SOURCE -MD -MP -D TECH_PREVIEW -Wcast-align LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed EXTRA_ARGS = --with-backtrace ifneq (,$(findstring event,$(DEB_BUILD_OPTIONS))) @@ -54,8 +54,12 @@ ifneq (,$(findstring rss,$(DEB_BUILD_OPTIONS))) CFLAGS += -D DEBUG_RSS endif +ifneq (,$(findstring cares,$(DEB_BUILD_OPTIONS))) + CFLAGS += -D DEBUG_CARES +endif + ifneq (,$(findstring iodbg,$(DEB_BUILD_OPTIONS))) - CFLAGS += -D BIGBAD_IODBG + CFLAGS += -D BIGBAD_IODBG -D LDAP_INITIALIZE endif ifneq (,$(findstring gcov,$(DEB_BUILD_OPTIONS))) @@ -67,7 +71,7 @@ configure: configure-stamp configure-stamp: dh_testdir - CC=$(COMPILER); LDFLAGS="$(LDFLAGS)"; CFLAGS="$(CFLAGS)" ./configure \ + export CC=$(COMPILER); export LDFLAGS="$(LDFLAGS)"; export CFLAGS="$(CFLAGS)"; ./configure \ --prefix=/var/lib/citadel/ \ --with-datadir=/var/lib/citadel/ \ --with-helpdir=/usr/share/citadel-server/ \