support dynamic linking of deps

Change-Id: Ifb03869fddec3e67f10f0aa7efd7d28a49b2b260

Makefile

@@ -4,9 +4,12 @@ CXXFLAGS=$(CPPFLAGS) -O2 -g -pipe -Wall -W -Werror -fPIC -fstrict-aliasing -Wno-
 CFLAGS=$(CPPFLAGS) -O2 -g -pipe -Wall -W -Werror -fPIC -fstrict-aliasing -Wno-unused-parameter
 
 INCPATH=-I. $(addprefix -I, $(INCS))
+LIBPATH = $(addprefix -L, $(LIBS))
 SRCEXTS = .c .cc .cpp .proto
 HDREXTS = .h .hpp
-LDFLAGS = -lpthread -lrt -ldl -lz -lssl -lcrypto
+#dyanmic linking of libprotoc.so crashes on ubuntu when protoc-gen-mcpack is invoked
+STATIC_LINKING += -lprotoc
+LDFLAGS = -Wl,-Bstatic $(STATIC_LINKING) -Wl,-Bdynamic $(DYNAMIC_LINKING)
 
 BASE_SOURCES = \
     base/third_party/dmg_fp/g_fmt.cc \
@@ -226,7 +229,7 @@ libmcpack2pb.a:$(MCPACK2PB_OBJS)
 
 protoc-gen-mcpack:mcpack2pb/generator.o libmcpack2pb.a libbase.a libbthread.a libbvar.a
 	@echo "Linking $@"
-	@$(CXX) -o protoc-gen-mcpack -Xlinker "-(" $^ $(LIBS) $(PROTOC_LIB) -Xlinker "-)" $(LDFLAGS)
+	@$(CXX) -o protoc-gen-mcpack -L$(LIBPATH) -Xlinker "-(" $^ -Xlinker "-)" $(LDFLAGS)
 
 libbrpc.a:$(BRPC_OBJS)
 	@echo "Linking $@"

config_brpc.sh

@@ -1,9 +1,15 @@
-#!/bin/bash
+if [ -z "$BASH" ]; then
+    ECHO=echo
+    ERROR='>&2 echo'
+else
+    ECHO='echo -e'
+    ERROR='>&2 echo -e'
+fi
 # NOTE: This requires GNU getopt.  On Mac OS X and FreeBSD, you have to install this
 # separately; see below.
 TEMP=`getopt -o v: --long incs:,libs:,cc:,cxx: -n 'config_brpc' -- "$@"`
 
-if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+if [ $? != 0 ] ; then $ERROR "Terminating..."; exit 1 ; fi
 
 # Note the quotes around `$TEMP': they are essential!
 eval set -- "$TEMP"
@@ -22,69 +28,131 @@ while true; do
     esac
 done
 if [ -z "$INCS" ] || [ -z "$LIBS" ]; then
-    >&2 echo "config_brpc: --incs=INCPATHS --libs=LIBPATHS must be specified"
+    $ERROR "config_brpc: --incs=INCPATHS --libs=LIBPATHS must be specified"
     exit 1
 fi
 
-find_lib() {
-    find ${LIBS} -name "$1" | head -n1
+find_dir_of_lib() {
+    dirname $(find ${LIBS} -name "lib${1}.a" -o -name "lib${1}.so" | head -n1)
 }
-find_lib_or_die() {
-    local lib=$(find_lib $1)
-    if [ -z "$lib" ]; then
-        >&2 echo "fail to find $1 from -libs"
+find_dir_of_lib_or_die() {
+    local dir=$(find_dir_of_lib $1)
+    if [ -z "$dir" ]; then
+        $ERROR "fail to find $1 from -libs"
         exit 1
     else
-        echo $lib
+        $ECHO $dir
     fi
 }
+
 find_dir_of_header() {
     find ${INCS} -path "*/$1" | sed "s|$1||g"
 }
 find_dir_of_header_or_die() {
     local dir=$(find_dir_of_header $1)
     if [ -z "$dir" ]; then
-        >&2 echo "fail to find $1 from -incs"
+        $ERROR "fail to find $1 from -incs"
         exit 1
     else
-        echo $dir
+        $ECHO $dir
+    fi
+}
+
+STATIC_LINKING=
+DYNAMIC_LINKING="-lpthread -lrt -lssl -lcrypto -ldl -lz"
+append_linking() {
+    if [ -f $1/lib${2}.a ]; then
+        STATIC_LINKING="${STATIC_LINKING} -l$2"
+    else
+        DYNAMIC_LINKING="${DYNAMIC_LINKING} -l$2"
     fi
 }
 
-GFLAGS_LIB=$(find_lib_or_die libgflags.a)
-PROTOBUF_LIB=$(find_lib_or_die libprotobuf.a)
-PROTOC_LIB=$(find_lib_or_die libprotoc.a)
+GFLAGS_DIR=$(find_dir_of_lib_or_die gflags)
+append_linking $GFLAGS_DIR gflags
+PROTOBUF_DIR=$(find_dir_of_lib_or_die protobuf)
+append_linking $PROTOBUF_DIR protobuf
+PROTOC_DIR=$(find_dir_of_lib_or_die protoc)
+LEVELDB_DIR=$(find_dir_of_lib_or_die leveldb)
+append_linking $LEVELDB_DIR leveldb
+# required by leveldb
+SNAPPY_DIR=$(find_dir_of_lib snappy)
+if [ ! -z "$SNAPPY_DIR" ]; then
+    append_linking $SNAPPY_DIR snappy
+fi
+
 PROTOC=$(which protoc 2>/dev/null)
 if [ -z "$PROTOC" ]; then
-    PROTOC=$(find_lib_or_die protoc)
+    PROTOC=$(find_dir_of_lib_or_die protoc)/protoc
 fi
-LEVELDB_LIB=$(find_lib_or_die libleveldb.a)
-SNAPPY_LIB=$(find_lib libsnappy.a)
 
 GFLAGS_INC=$(find_dir_of_header gflags/gflags.h)
 PROTOBUF_INC=$(find_dir_of_header google/protobuf/message.h)
 LEVELDB_INC=$(find_dir_of_header leveldb/db.h)
-NEW_INCS=$(echo $GFLAGS_INC $PROTOBUF_INC $LEVELDB_INC | sort | uniq)
+
+INCS=$($ECHO "$GFLAGS_INC\n$PROTOBUF_INC\n$LEVELDB_INC" | sort | uniq)
+LIBS=$($ECHO "$GFLAGS_DIR\n$PROTOBUF_DIR\n$LEVELDB_DIR\n$SNAPPY_DIR\n$PROTOC_DIR" | sort | uniq)
+
+absent_in_the_list() {
+    TMP=$($ECHO "`$ECHO "$1\n$2" | sort | uniq`")
+    if [ "${TMP}" = "$2" ]; then
+        return 1
+    fi
+    return 0
+}
 
 #can't use \n in texts because sh does not support -e
-echo "INCS=$NEW_INCS" > config.mk
-echo "LIBS=$GFLAGS_LIB $PROTOBUF_LIB $LEVELDB_LIB $SNAPPY_LIB" >> config.mk
-echo "PROTOC_LIB=$PROTOC_LIB" >> config.mk
-echo "PROTOC=$PROTOC" >> config.mk
-echo "PROTOBUF_INC=$PROTOBUF_INC" >> config.mk
-echo "CC=$CC" >> config.mk
-echo "CXX=$CXX" >> config.mk
-echo "ifeq (\$(LINK_PERFTOOLS), 1)" >> config.mk
-TCMALLOC_LIB=$(find_lib libtcmalloc_and_profiler.a)
-if [ ! -z "$TCMALLOC_LIB" ]; then
-    echo "    LIBS+=$TCMALLOC_LIB" >> config.mk
+CONTENT="INCS=$($ECHO $INCS)"
+CONTENT="${CONTENT}\nLIBS=$($ECHO $LIBS)"
+CONTENT="${CONTENT}\nPROTOC=$PROTOC"
+CONTENT="${CONTENT}\nPROTOBUF_INC=$PROTOBUF_INC"
+CONTENT="${CONTENT}\nCC=$CC"
+CONTENT="${CONTENT}\nCXX=$CXX"
+CONTENT="${CONTENT}\nSTATIC_LINKING=$STATIC_LINKING"
+CONTENT="${CONTENT}\nDYNAMIC_LINKING=$DYNAMIC_LINKING"
+CONTENT="${CONTENT}\nifeq (\$(LINK_PERFTOOLS), 1)"
+# required by cpu/heap profiler
+TCMALLOC_DIR=$(find_dir_of_lib tcmalloc_and_profiler)
+if [ ! -z "$TCMALLOC_DIR" ]; then
+    if absent_in_the_list "$TCMALLOC_DIR" "$LIBS"; then
+        CONTENT="${CONTENT}\n    LIBS+=$TCMALLOC_DIR"
+        LIBS="${LIBS}\n$TCMALLOC_DIR"
+    fi
     TCMALLOC_INC=$(find_dir_of_header google/tcmalloc.h)
-    if [ ! -z "$TCMALLOC_INC" ] && [ "$TCMALLOC_INC" != "$INCS" ]; then
-        echo "    INCS+=$TCMALLOC_INC" >> config.mk
+    if absent_in_the_list "$TCMALLOC_INC" "$INCS"; then
+        CONTENT="${CONTENT}\n    INCS+=$TCMALLOC_INC"
+    fi
+    if [ -f $TCMALLOC_DIR/libtcmalloc_and_profiler.a ]; then
+        CONTENT="${CONTENT}\n    STATIC_LINKING+=-ltcmalloc_and_profiler"
+    else
+        CONTENT="${CONTENT}\n    DYNAMIC_LINKING+=-ltcmalloc_and_profiler"
     fi
 fi
-UNWIND_LIB=$(find_lib libunwind.a)
-if [ ! -z "$UNWIND_LIB" ]; then
-    echo "    LIBS+=$UNWIND_LIB" >> config.mk
+# required by tcmalloc('s profiler)
+UNWIND_DIR=$(find_dir_of_lib unwind)
+if [ ! -z "$UNWIND_DIR" ]; then
+    if absent_in_the_list "$UNWIND_DIR" "$LIBS"; then
+        CONTENT="${CONTENT}\n    LIBS+=$UNWIND_DIR"
+        LIBS="${LIBS}\n$UNWIND_DIR"
+    fi
+    if [ -f $UNWIND_DIR/libunwind.a ]; then
+        CONTENT="${CONTENT}\n    STATIC_LINKING+=-lunwind"
+    else
+        CONTENT="${CONTENT}\n    DYNAMIC_LINKING+=-lunwind"
+    fi
+fi
+# required by libunwind
+LZMA_DIR=$(find_dir_of_lib lzma)
+if [ ! -z "$LZMA_DIR" ]; then
+    if absent_in_the_list "$LZMA_DIR" "$LIBS"; then
+        CONTENT="${CONTENT}\n    LIBS+=$LZMA_DIR"
+        LIBS="${LIBS}\n$LZMA_DIR"
+    fi
+    if [ -f $LZMA_DIR/liblzma.a ]; then
+        CONTENT="${CONTENT}\n    STATIC_LINKING+=-llzma"
+    else
+        CONTENT="${CONTENT}\n    DYNAMIC_LINKING+=-llzma"
+    fi
 fi
-echo "endif" >> config.mk
+CONTENT="${CONTENT}\nendif"
+$ECHO "$CONTENT" > config.mk

example/asynchronous_echo_c++/Makefile

@@ -3,8 +3,8 @@ BRPC_PATH = ../../output
 CPPFLAGS = -std=c++0x -g -DNDEBUG -O2 -pipe -W -Wall -Werror -fPIC -Wno-deprecated -Wno-unused-parameter -D__const__=
 CXXFLAGS = $(CPPFLAGS)
 INCPATH = -I$(BRPC_PATH)/include $(addprefix -I, $(INCS))
-LIBS += $(wildcard $(BRPC_PATH)/lib/lib*.a)
-LDFLAGS = -lpthread -lrt -lssl -lcrypto -ldl -lz
+LIBPATH = $(addprefix -L, $(LIBS))
+BRPC_LIBS = $(wildcard $(BRPC_PATH)/lib/lib*.a)
 
 CLIENT_SOURCES = client.cpp
 SERVER_SOURCES = server.cpp
@@ -14,6 +14,7 @@ PROTO_OBJS = $(addsuffix .pb.o, $(basename $(PROTOS)))
 PROTO_GENS = $(addsuffix .pb.h, $(basename $(PROTOS))) $(addsuffix .pb.cc, $(basename $(PROTOS)))
 CLIENT_OBJS = $(addsuffix .o, $(basename $(CLIENT_SOURCES))) 
 SERVER_OBJS = $(addsuffix .o, $(basename $(SERVER_SOURCES))) 
+LDFLAGS = -Wl,-Bstatic $(STATIC_LINKING) -Wl,-Bdynamic $(DYNAMIC_LINKING)
 
 .PHONY:all
 all: echo_client echo_server
@@ -25,11 +26,11 @@ clean:
 
 echo_client:$(PROTO_OBJS) $(CLIENT_OBJS)
 	@echo "Linking $@"
-	@$(CXX) -Xlinker "-(" $^ $(LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
+	@$(CXX) $(LIBPATH) -Xlinker "-(" $^ $(BRPC_LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
 
 echo_server:$(PROTO_OBJS) $(SERVER_OBJS)
 	@echo "Linking $@"
-	@$(CXX) -Xlinker "-(" $^ $(LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
+	@$(CXX) $(LIBPATH) -Xlinker "-(" $^ $(BRPC_LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
 
 %.pb.cc:%.proto
 	@echo "Generating $@"

example/backup_request_c++/Makefile

@@ -3,8 +3,8 @@ BRPC_PATH = ../../output
 CPPFLAGS = -std=c++0x -g -DNDEBUG -O2 -pipe -W -Wall -Werror -fPIC -Wno-deprecated -Wno-unused-parameter -D__const__=
 CXXFLAGS = $(CPPFLAGS)
 INCPATH = -I$(BRPC_PATH)/include $(addprefix -I, $(INCS))
-LIBS += $(wildcard $(BRPC_PATH)/lib/lib*.a)
-LDFLAGS = -lpthread -lrt -lssl -lcrypto -ldl -lz
+LIBPATH = $(addprefix -L, $(LIBS))
+BRPC_LIBS = $(wildcard $(BRPC_PATH)/lib/lib*.a)
 
 CLIENT_SOURCES = client.cpp
 SERVER_SOURCES = server.cpp
@@ -14,6 +14,7 @@ PROTO_OBJS = $(addsuffix .pb.o, $(basename $(PROTOS)))
 PROTO_GENS = $(addsuffix .pb.h, $(basename $(PROTOS))) $(addsuffix .pb.cc, $(basename $(PROTOS)))
 CLIENT_OBJS = $(addsuffix .o, $(basename $(CLIENT_SOURCES))) 
 SERVER_OBJS = $(addsuffix .o, $(basename $(SERVER_SOURCES))) 
+LDFLAGS = -Wl,-Bstatic $(STATIC_LINKING) -Wl,-Bdynamic $(DYNAMIC_LINKING)
 
 .PHONY:all
 all: echo_client echo_server
@@ -25,11 +26,11 @@ clean:
 
 echo_client:$(PROTO_OBJS) $(CLIENT_OBJS)
 	@echo "Linking $@"
-	@$(CXX) -Xlinker "-(" $^ $(LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
+	@$(CXX) $(LIBPATH) -Xlinker "-(" $^ $(BRPC_LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
 
 echo_server:$(PROTO_OBJS) $(SERVER_OBJS)
 	@echo "Linking $@"
-	@$(CXX) -Xlinker "-(" $^ $(LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
+	@$(CXX) $(LIBPATH) -Xlinker "-(" $^ $(BRPC_LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
 
 %.pb.cc:%.proto
 	@echo "Generating $@"

example/cancel_c++/Makefile

@@ -3,8 +3,8 @@ BRPC_PATH = ../../output
 CPPFLAGS = -std=c++0x -g -DNDEBUG -O2 -pipe -W -Wall -Werror -fPIC -Wno-deprecated -Wno-unused-parameter -D__const__=
 CXXFLAGS = $(CPPFLAGS)
 INCPATH = -I$(BRPC_PATH)/include $(addprefix -I, $(INCS))
-LIBS += $(wildcard $(BRPC_PATH)/lib/lib*.a)
-LDFLAGS = -lpthread -lrt -lssl -lcrypto -ldl -lz
+LIBPATH = $(addprefix -L, $(LIBS))
+BRPC_LIBS = $(wildcard $(BRPC_PATH)/lib/lib*.a)
 
 CLIENT_SOURCES = client.cpp
 SERVER_SOURCES = server.cpp
@@ -14,6 +14,7 @@ PROTO_OBJS = $(addsuffix .pb.o, $(basename $(PROTOS)))
 PROTO_GENS = $(addsuffix .pb.h, $(basename $(PROTOS))) $(addsuffix .pb.cc, $(basename $(PROTOS)))
 CLIENT_OBJS = $(addsuffix .o, $(basename $(CLIENT_SOURCES))) 
 SERVER_OBJS = $(addsuffix .o, $(basename $(SERVER_SOURCES))) 
+LDFLAGS = -Wl,-Bstatic $(STATIC_LINKING) -Wl,-Bdynamic $(DYNAMIC_LINKING)
 
 .PHONY:all
 all: echo_client echo_server
@@ -25,11 +26,11 @@ clean:
 
 echo_client:$(PROTO_OBJS) $(CLIENT_OBJS)
 	@echo "Linking $@"
-	@$(CXX) -Xlinker "-(" $^ $(LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
+	@$(CXX) $(LIBPATH) -Xlinker "-(" $^ $(BRPC_LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
 
 echo_server:$(PROTO_OBJS) $(SERVER_OBJS)
 	@echo "Linking $@"
-	@$(CXX) -Xlinker "-(" $^ $(LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
+	@$(CXX) $(LIBPATH) -Xlinker "-(" $^ $(BRPC_LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
 
 %.pb.cc:%.proto
 	@echo "Generating $@"

example/cascade_echo_c++/Makefile

@@ -5,11 +5,10 @@ CPPFLAGS=-std=c++0x -g -DNDEBUG -O2 -pipe -W -Wall -Werror -fPIC -Wno-deprecated
 CXXFLAGS=$(CPPFLAGS)
 CFLAGS=$(CPPFLAGS)
 INCPATH=-I$(BRPC_PATH)/include $(addprefix -I, $(INCS))
-LIBS+=$(wildcard $(BRPC_PATH)/lib/lib*.a)
-LDFLAGS=-lpthread -lrt -lssl -lcrypto -ldl -lz
+LIBPATH = $(addprefix -L, $(LIBS))
+BRPC_LIBS=$(wildcard $(BRPC_PATH)/lib/lib*.a)
 ifeq ($(LINK_PERFTOOLS), 1)
 	CPPFLAGS += -DBRPC_ENABLE_CPU_PROFILER -DBRPC_ENABLE_HEAP_PROFILER
-	LDFLAGS += -llzma
 endif
 
 CLIENT_SOURCES = client.cpp
@@ -20,6 +19,7 @@ PROTO_OBJS = $(addsuffix .pb.o, $(basename $(PROTOS)))
 PROTO_GENS = $(addsuffix .pb.h, $(basename $(PROTOS))) $(addsuffix .pb.cc, $(basename $(PROTOS)))
 CLIENT_OBJS = $(addsuffix .o, $(basename $(CLIENT_SOURCES))) 
 SERVER_OBJS = $(addsuffix .o, $(basename $(SERVER_SOURCES))) 
+LDFLAGS = -Wl,-Bstatic $(STATIC_LINKING) -Wl,-Bdynamic $(DYNAMIC_LINKING)
 
 .PHONY:all
 all: echo_client echo_server
@@ -31,11 +31,11 @@ clean:
 
 echo_client:$(PROTO_OBJS) $(CLIENT_OBJS)
 	@echo "Linking $@"
-	@$(CXX) -Xlinker "-(" $^ $(LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
+	@$(CXX) $(LIBPATH) -Xlinker "-(" $^ $(BRPC_LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
 
 echo_server:$(PROTO_OBJS) $(SERVER_OBJS)
 	@echo "Linking $@"
-	@$(CXX) -Xlinker "-(" $^ $(LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
+	@$(CXX) $(LIBPATH) -Xlinker "-(" $^ $(BRPC_LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
 
 %.pb.cc:%.proto
 	@echo "Generating $@"

example/dynamic_partition_echo_c++/Makefile

@@ -5,11 +5,10 @@ CPPFLAGS=-std=c++0x -g -DNDEBUG -O2 -pipe -W -Wall -Werror -fPIC -Wno-deprecated
 CXXFLAGS=$(CPPFLAGS)
 CFLAGS=$(CPPFLAGS)
 INCPATH=-I$(BRPC_PATH)/include $(addprefix -I, $(INCS))
-LIBS+=$(wildcard $(BRPC_PATH)/lib/lib*.a)
-LDFLAGS=-lpthread -lrt -lssl -lcrypto -ldl -lz
+LIBPATH = $(addprefix -L, $(LIBS))
+BRPC_LIBS=$(wildcard $(BRPC_PATH)/lib/lib*.a)
 ifeq ($(LINK_PERFTOOLS), 1)
 	CPPFLAGS += -DBRPC_ENABLE_CPU_PROFILER -DBRPC_ENABLE_HEAP_PROFILER
-	LDFLAGS += -llzma
 endif
 
 CLIENT_SOURCES = client.cpp
@@ -20,6 +19,7 @@ PROTO_OBJS = $(addsuffix .pb.o, $(basename $(PROTOS)))
 PROTO_GENS = $(addsuffix .pb.h, $(basename $(PROTOS))) $(addsuffix .pb.cc, $(basename $(PROTOS)))
 CLIENT_OBJS = $(addsuffix .o, $(basename $(CLIENT_SOURCES))) 
 SERVER_OBJS = $(addsuffix .o, $(basename $(SERVER_SOURCES))) 
+LDFLAGS = -Wl,-Bstatic $(STATIC_LINKING) -Wl,-Bdynamic $(DYNAMIC_LINKING)
 
 .PHONY:all
 all: echo_client echo_server
@@ -31,11 +31,11 @@ clean:
 
 echo_client:$(PROTO_OBJS) $(CLIENT_OBJS)
 	@echo "Linking $@"
-	@$(CXX) -Xlinker "-(" $^ $(LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
+	@$(CXX) $(LIBPATH) -Xlinker "-(" $^ $(BRPC_LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
 
 echo_server:$(PROTO_OBJS) $(SERVER_OBJS)
 	@echo "Linking $@"
-	@$(CXX) -Xlinker "-(" $^ $(LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
+	@$(CXX) $(LIBPATH) -Xlinker "-(" $^ $(BRPC_LIBS) -Xlinker "-)" $(LDFLAGS) -o $@
 
 %.pb.cc:%.proto
 	@echo "Generating $@"