diff options
| author |   yalei wang <wylandrea@gmail.com> | 2018-10-27 00:45:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-10-27 00:45:04 +0000 |
| commit | 3dd2a5fdd89db1d532229d2ec29078e8e4b23689 (patch) | |
| tree | dd68cc65c17af6ae5bbee5e40349c0dfecf310cd | |
| parent | 72311fed58a2eab46402d74a0b2b804ddd01945e (diff) | |
| parent | 929ec1aa113dda1986f26f8f314d4631114cb7b9 (diff) | |
Merge "Fix: nginx use epoll"
| -rw-r--r-- | stacks/lwip_stack/lwip_src/api/spl_api_msg.c | 2 | ||||
| -rw-r--r-- | thirdparty/apps/CMakeLists.txt | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/stacks/lwip_stack/lwip_src/api/spl_api_msg.c b/stacks/lwip_stack/lwip_src/api/spl_api_msg.c index d8e088a..c4052b3 100644 --- a/stacks/lwip_stack/lwip_src/api/spl_api_msg.c +++ b/stacks/lwip_stack/lwip_src/api/spl_api_msg.c @@ -3322,5 +3322,7 @@ alloc_common_pcb (enum spl_netconn_type type) common_pcb_init (cpcb); cpcb->type = type; + + res_alloc (&cpcb->res_chk); return cpcb; } diff --git a/thirdparty/apps/CMakeLists.txt b/thirdparty/apps/CMakeLists.txt index 2cf5240..8df3cb8 100644 --- a/thirdparty/apps/CMakeLists.txt +++ b/thirdparty/apps/CMakeLists.txt @@ -28,18 +28,19 @@ endif() INCLUDE(ExternalProject) ExternalProject_Add( - NGINX - URL ${NGINX_URL} - DOWNLOAD_DIR ${NGINX_DOWNLOAD_DIR} - DOWNLOAD_COMMAND ${NGINX_DOWNLOAD_CMD} - 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 - INSTALL_COMMAND make install - DEPENDS nStackAPI + NGINX + URL ${NGINX_URL} + DOWNLOAD_DIR ${NGINX_DOWNLOAD_DIR} + DOWNLOAD_COMMAND ${NGINX_DOWNLOAD_CMD} + 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 "47 s/$/\"/" ${CMAKE_CURRENT_LIST_DIR}/nginx/nginx-1.14.0/auto/os/linux + 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 + INSTALL_COMMAND make install + DEPENDS nStackAPI ) set_target_properties(NGINX PROPERTIES EXCLUDE_FROM_ALL TRUE) |