From 92fb81003c34e1e4c4e9cc25cce93ce9af50ee96 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 15 Sep 2016 12:59:34 +0800 Subject: [PATCH 1/3] link crypto when use sys-ssl --- trunk/configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/configure b/trunk/configure index 4a5e7b5b2..425b9b0f1 100755 --- a/trunk/configure +++ b/trunk/configure @@ -127,7 +127,7 @@ LibGperfRoot=""; LibGperfFile="" if [ $SRS_GPERF = YES ]; then LibGperfRoot="${SRS_OBJS_DIR}/gperf/include"; LibGperfFile="${SRS_OBJS_DIR}/gperf/lib/libtcmalloc_and_profiler.a"; fi # the link options, always use static link SrsLinkOptions="-ldl"; -if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lssl"; fi fi +if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lssl -lcrypto"; fi fi # if static specified, add static # TODO: FIXME: remove static. if [ $SRS_STATIC = YES ]; then SrsLinkOptions="${SrsLinkOptions} -static"; fi From 4bcd90d747bb200b7a9946b72bd0d833337c0964 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 15 Sep 2016 13:11:42 +0800 Subject: [PATCH 2/3] fix sys-ssl librtmp build bug. --- trunk/research/librtmp/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/trunk/research/librtmp/Makefile b/trunk/research/librtmp/Makefile index 9a5aefd76..15aa35f6d 100755 --- a/trunk/research/librtmp/Makefile +++ b/trunk/research/librtmp/Makefile @@ -70,6 +70,9 @@ endif ifeq ($(HANDSHAKE), SSL) SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a endif +ifneq ($(shell test -f $(SRS_OBJS)/openssl/lib/libssl.a && echo yes), yes) + SRS_LIBSSL_L = -lssl -lcrypt +endif ssl: @mkdir -p objs From 99d87f9f9c5284454f64bdd94b1f6133b137a0cd Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 15 Sep 2016 13:17:58 +0800 Subject: [PATCH 3/3] fix sys-ssl librtmp build bug. --- trunk/research/librtmp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/research/librtmp/Makefile b/trunk/research/librtmp/Makefile index 15aa35f6d..752113f41 100755 --- a/trunk/research/librtmp/Makefile +++ b/trunk/research/librtmp/Makefile @@ -71,7 +71,7 @@ ifeq ($(HANDSHAKE), SSL) SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a endif ifneq ($(shell test -f $(SRS_OBJS)/openssl/lib/libssl.a && echo yes), yes) - SRS_LIBSSL_L = -lssl -lcrypt + SRS_LIBSSL_L = -lssl -lcrypto endif ssl: