From 198eab0fa35eb15d33a1c1c260168bb1f13e376b Mon Sep 17 00:00:00 2001 From: Sashi Penta Date: Sat, 13 Dec 2014 02:14:40 -0800 Subject: [PATCH] Add required compiler flags for CA integration Signed-off-by: Sashi Penta Change-Id: Ib5ef49afa6fbb729b7cd3208e6522af859c5b964 --- resource/csdk/connectivity/build/linux/Makefile | 3 ++- resource/csdk/makefile | 7 +++++-- .../csdk/stack/samples/linux/SimpleClientServer/makefile | 16 ++++++++-------- resource/examples/makefile | 2 +- resource/examples/ocicuc/Makefile | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/resource/csdk/connectivity/build/linux/Makefile b/resource/csdk/connectivity/build/linux/Makefile index edf85e2..5bc50e9 100644 --- a/resource/csdk/connectivity/build/linux/Makefile +++ b/resource/csdk/connectivity/build/linux/Makefile @@ -110,7 +110,8 @@ COMPONENT_OBJS = $(COMPONENT_SRCS:%.c=$(OBJ_DIR)/%.o) ## ## compiler flags ## -CFLAGS = -g -c -Wall -fPIC `pkg-config --cflags glib-2.0` +# TODO-CA Remove -fstack-protector-all before merging to master +CFLAGS = -g -c -Wall -fstack-protector-all -fPIC `pkg-config --cflags glib-2.0` LFLAGS = -ldl -lpthread `pkg-config --libs glib-2.0` IFLAGS = -I$(PROJECT_COMMON_INC_PATH) \ -I$(PROJECT_API_PATH) \ diff --git a/resource/csdk/makefile b/resource/csdk/makefile index 53c218a..c3582ed 100644 --- a/resource/csdk/makefile +++ b/resource/csdk/makefile @@ -121,9 +121,12 @@ INC_DIRS += -I$(OCTBSTACK_INC) INC_DIRS += -I$(OCTBSTACK_INC)/internal INC_DIRS += -I$(CJSON_INC) INC_DIRS += -I$(CONNECTIVITY_INC) +INC_DIRS += -I$(CONNECTIVITY_DIR)/api -CC_FLAGS.debug := -O0 -g3 -Wall -c -fmessage-length=0 -pedantic -fpic -DTB_LOG -CC_FLAGS.release := -Os -Wall -c -fmessage-length=0 -fpic +# TODO-CA Remove -fstack-protector-all before merging to master +CC_FLAGS.debug := -O0 -g3 -Wall -fstack-protector-all -c -fmessage-length=0 -pedantic -fpic -DTB_LOG +# TODO-CA Remove -fstack-protector-all before merging to master +CC_FLAGS.release := -Os -Wall -fstack-protector-all -c -fmessage-length=0 -fpic CFLAGS += $(CC_FLAGS.$(BUILD)) $(INC_DIRS) $(CFLAGS_PLATFORM) $(INC_DIR_PLATFORM) LDLIBS += -lcoap diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/makefile b/resource/csdk/stack/samples/linux/SimpleClientServer/makefile index 6513ce2..26eaa6a 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/makefile +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/makefile @@ -65,14 +65,14 @@ INC_DIRS += -I$(OCMALLOC_INC) INC_DIRS += -I$(OCTBSTACK_INC) INC_DIRS += -I$(CJSON_INC) -CC_FLAGS.debug := -O0 -g3 -Wall -ffunction-sections -fdata-sections -fno-exceptions \ - -std=c++0x -pedantic $(INC_DIRS) -L$(ROOT_DIR)/linux/$(BUILD) -DTB_LOG \ - -L$(CONNECTIVITY_DIR)/build/out -lconnectivity_abstraction -CC_FLAGS.release := -Os -Wall -fdata-sections -Wl,--gc-sections -Wl,-s -fno-exceptions \ - -std=c++0x $(INC_DIRS) -L$(ROOT_DIR)/linux/$(BUILD) -DTB_LOG \ - -L$(CONNECTIVITY_DIR)/build/out -lconnectivity_abstraction - -LDLIBS += -loctbstack -lpthread +# TODO-CA Remove -fstack-protector-all before merging to master +CC_FLAGS.debug := -O0 -g3 -Wall -fstack-protector-all -ffunction-sections -fdata-sections -fno-exceptions \ + -std=c++0x -pedantic $(INC_DIRS) -L$(ROOT_DIR)/linux/$(BUILD) -DTB_LOG +# TODO-CA Remove -fstack-protector-all before merging to master +CC_FLAGS.release := -Os -Wall -fstack-protector-all -fdata-sections -Wl,--gc-sections -Wl,-s -fno-exceptions \ + -std=c++0x $(INC_DIRS) -L$(ROOT_DIR)/linux/$(BUILD) -DTB_LOG + +LDLIBS += -loctbstack -lpthread -L$(CONNECTIVITY_DIR)/build/out -lconnectivity_abstraction CPPFLAGS += $(CC_FLAGS.$(BUILD)) $(LDLIBS) CJSON_SOURCES := $(CJSON_SRC)/cJSON.c diff --git a/resource/examples/makefile b/resource/examples/makefile index c97f2aa..1360c01 100644 --- a/resource/examples/makefile +++ b/resource/examples/makefile @@ -40,7 +40,7 @@ CXX_INC += -I../csdk/libcoap LIB_OC_LOGGER := ../oc_logger/lib/oc_logger.a -CXX_LIBS := ../$(BUILD)/obj/liboc.a ../csdk/$(PLATFORM)/$(BUILD)/liboctbstack.a $(LIB_OC_LOGGER) +CXX_LIBS := ../$(BUILD)/obj/liboc.a ../csdk/$(PLATFORM)/$(BUILD)/liboctbstack.a $(LIB_OC_LOGGER) -L../csdk/connectivity/build/out -lconnectivity_abstraction # Force metatargets to build: all.PHONY: prep_dirs oc_cpp_sdk simpleserver simpleserverHQ simpleclient simpleclientHQ simpleclientserver roomserver roomclient presenceserver presenceclient garageserver garageclient fridgeserver fridgeclient ocicuc_target threadingsample diff --git a/resource/examples/ocicuc/Makefile b/resource/examples/ocicuc/Makefile index 17556f8..76f9ee7 100644 --- a/resource/examples/ocicuc/Makefile +++ b/resource/examples/ocicuc/Makefile @@ -48,7 +48,7 @@ BOOST_LIBS=-lboost_program_options LIB_OC_LOGGER:=../../oc_logger/lib/oc_logger.a -CXX_LIBS=$(OCLIB_LIB) ../../csdk/$(PLATFORM)/$(BUILD)/liboctbstack.a $(LIB_OC_LOGGER) $(BOOST_LIBS) +CXX_LIBS=$(OCLIB_LIB) ../../csdk/$(PLATFORM)/$(BUILD)/liboctbstack.a $(LIB_OC_LOGGER) $(BOOST_LIBS) -L../../csdk/connectivity/build/out -lconnectivity_abstraction APPS += client APPS += server -- 2.7.4