From f97f874e5f9b2ea4891ba44f45ae2416f3b99b6d Mon Sep 17 00:00:00 2001 From: fabriziopicconi Date: Sat, 12 Apr 2014 17:13:43 +0200 Subject: [PATCH 1/2] thrift 0.9 thrift 0.9 support --- modules/cachedb_cassandra/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cachedb_cassandra/Makefile b/modules/cachedb_cassandra/Makefile index dc812346df0..9326177ef09 100644 --- a/modules/cachedb_cassandra/Makefile +++ b/modules/cachedb_cassandra/Makefile @@ -5,7 +5,7 @@ NAME=cachedb_cassandra.so CXX=g++ LD=g++ LIBS=cachedb_cassandra_dbase.o cassandra_constants.o cassandra_types.o Cassandra.o -L/usr/local/lib -lthrift -CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) +CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) -DHAVE_NETINET_IN_H # suppress a TON of warnings CXXFLAGS+= -Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing From 472d0496b5451c3c2b2665e7f8f610eb54a81f21 Mon Sep 17 00:00:00 2001 From: fabriziopicconi Date: Sun, 27 Apr 2014 15:47:49 +0200 Subject: [PATCH 2/2] Update Makefile --- modules/cachedb_cassandra/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/cachedb_cassandra/Makefile b/modules/cachedb_cassandra/Makefile index 9326177ef09..166a92e7102 100644 --- a/modules/cachedb_cassandra/Makefile +++ b/modules/cachedb_cassandra/Makefile @@ -13,18 +13,18 @@ include ../../Makefile.modules cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h @echo "Compiling $<" - $(Q)$(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(Q)$(CXX) $(CXXFLAGS) -I/usr/include/thrift -I/usr/local/include/thrift -c $< -o $@ cassandra_types.o: cassandra_types.cpp cassandra_types.h @echo "Compiling $<" - $(Q)$(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(Q)$(CXX) $(CXXFLAGS) -I/usr/include/thrift -I/usr/local/include/thrift -c $< -o $@ Cassandra.o: Cassandra.cpp Cassandra.h @echo "Compiling $<" - $(Q)$(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(Q)$(CXX) $(CXXFLAGS) -I/usr/include/thrift -I/usr/local/include/thrift -c $< -o $@ cachedb_cassandra_dbase.o: cachedb_cassandra_dbase.cpp cachedb_cassandra_lib.h cachedb_cassandra_dbase.h @echo "Compiling $<" - $(Q)$(CXX) $(CXXFLAGS) $(DEFS) -I/usr/local/include/thrift -c $< -o $@ + $(Q)$(CXX) $(CXXFLAGS) $(DEFS) -I/usr/include/thrift -I/usr/local/include/thrift -c $< -o $@ cachedb_cassandra.so: cachedb_cassandra_dbase.o cassandra_constants.o cassandra_types.o Cassandra.o