diff options
| author |   yalei wang <wylandrea@gmail.com> | 2018-08-01 07:12:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-08-01 07:12:07 +0000 |
| commit | 2e42d73f30becf528c5540531d02316833ac0320 (patch) | |
| tree | cb40cecf2234dcc4fe29a2f9e1a54b4fb6ca9bd5 | |
| parent | 51884d17a7e9a5a6f15ac95707303a8479c1013f (diff) | |
| parent | 25cf825bdc565131e1bafc202c2d67e588b84088 (diff) | |
Merge "Fix: build nginx with epoll"
| -rw-r--r-- | thirdparty/apps/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/thirdparty/apps/CMakeLists.txt b/thirdparty/apps/CMakeLists.txt index de58120..5a0daff 100644 --- a/thirdparty/apps/CMakeLists.txt +++ b/thirdparty/apps/CMakeLists.txt @@ -10,7 +10,7 @@ else() SET(NGINX_DOWNLOAD_CMD wget --no-check-certificate -O nginx-1.12.2.tar.gz ${NGINX_URL} && tar -xvf ${NGINX_DOWNLOAD_DIR}/nginx-1.12.2.tar.gz -C ${NGINX_DOWNLOAD_DIR}/nginx-1.12.2 --strip-components 1) endif() -INCLUDE(ExternalProject) +INCLUDE(ExternalProject) ExternalProject_Add( NGINX URL ${NGINX_URL} @@ -19,8 +19,9 @@ ExternalProject_Add( BUILD_IN_SOURCE 1 SOURCE_DIR ${NGINX_SRC} PATCH_COMMAND echo "./configure --with-ld-opt=\"-L${LIB_PATH_SHARED}/ -lnStackAPI -Wl,-rpath=${LIB_PATH_SHARED}\" --sbin-path=${NGINX_RELEASE}/nginx --conf-path=${NGINX_RELEASE}/nginx.conf --pid-path=${NGINX_RELEASE}/nginx.pid " > configure.sh + COMMAND sed -i -e "48,49 s/^/#/" ${CMAKE_CURRENT_LIST_DIR}/nginx/nginx-1.12.2/auto/os/linux CONFIGURE_COMMAND sh configure.sh - BUILD_COMMAND make + BUILD_COMMAND make INSTALL_COMMAND make install DEPENDS nStackAPI ) |