[incubator-brpc] branch master updated: Fix compilation errors caused by ssl on MacOS

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git


The following commit(s) were added to refs/heads/master by this push:
     new 0664bb9  Fix compilation errors caused by ssl on MacOS
     new e255604  Merge pull request #770 from gavinchou/master
0664bb9 is described below

commit 0664bb909eb148ac6d4fbf921c1270be14312ea2
Author: Gavin Chou <ga...@gmail.com>
AuthorDate: Thu May 16 13:10:23 2019 +0800

    Fix compilation errors caused by ssl on MacOS
    
    Related issue: #328 #360 #666 #723 #726
---
 config_brpc.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config_brpc.sh b/config_brpc.sh
index a1934d7..c5970fd 100755
--- a/config_brpc.sh
+++ b/config_brpc.sh
@@ -136,6 +136,9 @@ find_dir_of_header_or_die() {
     $ECHO $dir
 }
 
+# User specified path of openssl, if not given it's empty
+OPENSSL_LIB=$(find_dir_of_lib ssl)
+
 # Inconvenient to check these headers in baidu-internal
 #PTHREAD_HDR=$(find_dir_of_header_or_die pthread.h)
 OPENSSL_HDR=$(find_dir_of_header_or_die openssl/ssl.h)
@@ -233,7 +236,7 @@ PROTOBUF_HDR=$(find_dir_of_header_or_die google/protobuf/message.h)
 LEVELDB_HDR=$(find_dir_of_header_or_die leveldb/db.h)
 
 HDRS=$($ECHO "$GFLAGS_HDR\n$PROTOBUF_HDR\n$LEVELDB_HDR\n$OPENSSL_HDR" | sort | uniq)
-LIBS=$($ECHO "$GFLAGS_LIB\n$PROTOBUF_LIB\n$LEVELDB_LIB\n$SNAPPY_LIB" | sort | uniq)
+LIBS=$($ECHO "$GFLAGS_LIB\n$PROTOBUF_LIB\n$LEVELDB_LIB\n$OPENSSL_LIB\n$SNAPPY_LIB" | sort | uniq)
 
 absent_in_the_list() {
     TMP=`$ECHO "$1\n$2" | sort | uniq`


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@brpc.apache.org
For additional commands, e-mail: dev-help@brpc.apache.org