From 90a6f955e0692d95c794e63bea2ccb3748c61b22 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Thu, 15 Dec 2016 20:25:15 -0800 Subject: [PATCH] Stop building libevent with OpenSSL support. Missed in commit a10174c29cf9106d081c06d6963d564dca3a4557. Signed-off-by: Piotr Sikora --- ci/build_container/build_container.sh | 4 +--- source/exe/CMakeLists.txt | 1 - test/CMakeLists.txt | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ci/build_container/build_container.sh b/ci/build_container/build_container.sh index 390bc23f96522..19c1b68f9809d 100755 --- a/ci/build_container/build_container.sh +++ b/ci/build_container/build_container.sh @@ -38,9 +38,7 @@ rm -fr openssl* wget https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz tar xf libevent-2.0.22-stable.tar.gz cd libevent-2.0.22-stable -./configure --prefix=$THIRDPARTY_BUILD --enable-shared=no --disable-libevent-regress \ - CPPFLAGS=-I$THIRDPARTY_BUILD/include LDFLAGS=-L$THIRDPARTY_BUILD/lib \ - OPENSSL_LIBADD=-ldl +./configure --prefix=$THIRDPARTY_BUILD --enable-shared=no --disable-libevent-regress --disable-openssl make install cd .. rm -fr libevent* diff --git a/source/exe/CMakeLists.txt b/source/exe/CMakeLists.txt index fdd39b6e9f759..813ba45539415 100644 --- a/source/exe/CMakeLists.txt +++ b/source/exe/CMakeLists.txt @@ -5,7 +5,6 @@ if (ENVOY_TCMALLOC) endif() target_link_libraries(envoy event) -target_link_libraries(envoy event_openssl) target_link_libraries(envoy event_pthreads) target_link_libraries(envoy http_parser) target_link_libraries(envoy ssl) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e5962891cc256..056c80beedc30 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -141,7 +141,6 @@ if (ENVOY_TCMALLOC) endif() target_link_libraries(envoy-test event) -target_link_libraries(envoy-test event_openssl) target_link_libraries(envoy-test event_pthreads) target_link_libraries(envoy-test http_parser) target_link_libraries(envoy-test ssl)