diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2022-12-03 00:20:23 -0500 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2022-12-03 00:20:23 -0500 |
| commit | 33fd0db9e5acb8a7675400d032fff178de0a7c6e (patch) | |
| tree | 57f1e1f5bb8887417a8a4251b5aec78dba35afea /scripts | |
| parent | 3625f99bd2d65f194bde56567c0765db730c5633 (diff) | |
| download | lighttpd-git-33fd0db9e5acb8a7675400d032fff178de0a7c6e.tar.gz | |
[core] remove libev fdevent option (ignore)
lighttpd directly uses native OS event handlers
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ci-build.sh | 5 | ||||
| -rw-r--r-- | scripts/cmake/FindLibEV.cmake | 70 |
2 files changed, 2 insertions, 73 deletions
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 88b1fac7..e0e4b239 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -20,7 +20,7 @@ case "${build}" in --with-ldap --with-pcre2 \ --with-zlib --with-zstd --with-brotli --with-bzip2 \ --with-webdav-props --with-webdav-locks \ - --with-lua --with-libev --with-libunwind \ + --with-lua --with-libunwind \ --with-krb5 \ --with-nettle \ --with-gnutls \ @@ -41,7 +41,7 @@ case "${build}" in --with-ldap --with-pcre2 \ --with-zlib --with-zstd --with-brotli --with-bzip2 \ --with-webdav-props --with-webdav-locks \ - --with-lua --with-libev --with-libunwind \ + --with-lua --with-libunwind \ --with-krb5 --with-sasl \ --with-nettle \ --with-gnutls \ @@ -66,7 +66,6 @@ case "${build}" in -DWITH_BROTLI=ON \ -DWITH_BZIP=ON \ -DWITH_LDAP=ON \ - -DWITH_LIBEV=ON \ -DWITH_LIBUNWIND=ON \ -DWITH_LUA=ON \ -DWITH_DBI=ON \ diff --git a/scripts/cmake/FindLibEV.cmake b/scripts/cmake/FindLibEV.cmake deleted file mode 100644 index 739b4bad..00000000 --- a/scripts/cmake/FindLibEV.cmake +++ /dev/null @@ -1,70 +0,0 @@ - -set(LIBEV_PATH "" CACHE PATH "Base path for include/ev.h and lib/libev*") -set(LIBEV_INCLUDE_PATH "" CACHE PATH "Include path for ev.h") -set(LIBEV_LIBDIR "" CACHE PATH "Path containing libev") - -if(LIBEV_PATH) - set(LIBEV_INCLUDE_PATH "${LIBEV_PATH}/include" CACHE PATH "Include path for ev.h" FORCE) - set(LIBEV_LIBDIR "${LIBEV_PATH}/lib" CACHE PATH "Path containing libev" FORCE) -endif() - -if(LIBEV_INCLUDE_PATH) - include_directories(${LIBEV_INCLUDE_PATH}) -endif() - -# Use cached result -if(NOT LIBEV_FOUND) - unset(HAVE_EV_H) - unset(HAVE_LIBEV) - unset(HAVE_EV_H CACHE) - unset(HAVE_LIBEV CACHE) - unset(LIBEV_CFLAGS) - unset(LIBEV_LDFLAGS) - - if(LIBEV_INCLUDE_PATH OR LIBEV_LIBDIR) - set(CMAKE_REQUIRED_INCLUDES ${LIBEV_INCLUDE_PATH}) -# message(STATUS "Looking for ev.h in ${CMAKE_REQUIRED_INCLUDES}") - check_include_files(ev.h HAVE_EV_H) - if(HAVE_EV_H) -# message(STATUS "Looking for lib ev in ${LIBEV_LIBDIR}") - check_library_exists(ev ev_time "${LIBEV_LIBDIR}" HAVE_LIBEV) - if(HAVE_LIBEV) - set(LIBEV_CFLAGS "" CACHE INTERNAL "") - set(LIBEV_LDFLAGS "-L${LIBEV_LIBDIR} -lev" CACHE INTERNAL "") - set(LIBEV_FOUND TRUE CACHE INTERNAL "Found libev") - else() - message(STATUS "Couldn't find lib ev in ${LIBEV_LIBDIR}") - endif() - else() - message(STATUS "Couldn't find <ev.h> in ${LIBEV_INCLUDE_PATH}") - endif() - else() - pkg_check_modules(LIBEV libev) - if(NOT LIBEV_FOUND) -# message(STATUS "Looking for ev.h in ${CMAKE_REQUIRED_INCLUDES}") - check_include_files(ev.h HAVE_EV_H) - if(HAVE_EV_H) -# message(STATUS "Looking for lib ev") - check_library_exists(ev ev_time "" HAVE_LIBEV) - if(HAVE_LIBEV) - set(LIBEV_CFLAGS "" CACHE INTERNAL "") - set(LIBEV_LDFLAGS "-lev" CACHE INTERNAL "") - set(LIBEV_FOUND TRUE CACHE INTERNAL "Found libev") - else() - message(STATUS "Couldn't find lib ev") - endif() - else() - message(STATUS "Couldn't find <ev.h>") - endif() - endif() - endif() - -endif() - -if(NOT LIBEV_FOUND) - if(LibEV_FIND_REQUIRED) - message(FATAL_ERROR "Could not find libev") - endif() -endif() - -mark_as_advanced(LIBEV_PATH LIBEV_INCLUDE_PATH LIBEV_LIBDIR) |