Commit 49fb6224 authored by Axel Auweter's avatar Axel Auweter
Browse files

Linux build fixes...

parent b0bf5b47
......@@ -6,7 +6,7 @@ PROJECTS = FilePusher SysFsPusher CollectAgent ParastationProvider IPMIPusher Mo
CASSANDRA_VERSION = 1.2.19
THRIFT_VERSION = 0.9.2
MOSQUITTO_VERSION = 1.3.5
BOOST_VERSION = 1.56.0
BOOST_VERSION = 1.57.0
SNMP_VERSION = 5.7.2.1
OPENSSL_VERSION = 1.0.1k
LIBEVENT_VERSION = 2.0.21-stable
......@@ -45,7 +45,7 @@ DISTFILESNAMES = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/;.*//'))
DISTFILESPATHS = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/.tar.gz;.*//' | sed 's/.zip;.*//' ))
CFLAGS += -I$(DCDBDEPLOYPATH)/include -O0 -g
CXX11FLAGS = --std=c++11 -Wno-c99-extensions
CXX11FLAGS = --std=c++11 -Wno-c99-extensions -Wno-missing-field-initializers
LDFLAGS += -L$(DCDBDEPLOYPATH)/lib -O0 -g
.PHONY : info all clean cleanall distclean $(LIBRARIES) $(PROJECTS)
......@@ -184,7 +184,7 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
cd $(DCDBDEPSPATH)/$(B) && (patch -N -p2 < $(DCDBDEPSPATH)/patches/$(B).patch || true); \
fi; \
cd $(DCDBDEPSPATH)/$(B) && ./bootstrap.sh --prefix=$(DCDBDEPLOYPATH) \
--with-libraries=atomic,chrono,date_time,exception,filesystem,program_options,thread,timer && \
--with-libraries=atomic,chrono,date_time,exception,filesystem,program_options,random,system,thread,timer && \
./b2 -j $(MAKETHREADS) install && touch $(DCDBDEPSPATH)/$(B)/.installed; \
else \
echo "Skipping Boost (already built)..."; \
......@@ -258,7 +258,7 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
-DCASS_USE_EXTERNAL_BOOST=YES \
-DINSTALL_LIB_DIR=lib \
-DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \
$(DCDBDEPSPATH)/$(D) && \
$(DCDBDEPSPATH)/$(D) && \
make -j $(MAKETHREADS) && make install && \
touch $(DCDBDEPSPATH)/$(D)/.installed; \
else \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment