mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-26 12:45:20 +03:00
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
Upstream: Yes
|
|
Reason: Without this patch make check fails
|
|
Url: https://github.com/h2o/h2o/issues/2167
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -386,13 +386,13 @@
|
|
OUTPUT_NAME h2o
|
|
VERSION ${LIBRARY_VERSION}
|
|
SOVERSION ${LIBRARY_SOVERSION})
|
|
-TARGET_LINK_LIBRARIES(libh2o ${LIBUV_LIBRARIES} ${EXTRA_LIBS})
|
|
+TARGET_LINK_LIBRARIES(libh2o ${WSLAY_LIBRARIES} ${LIBUV_LIBRARIES} ${EXTRA_LIBS})
|
|
SET_TARGET_PROPERTIES(libh2o-evloop PROPERTIES
|
|
OUTPUT_NAME h2o-evloop
|
|
COMPILE_FLAGS "-DH2O_USE_LIBUV=0"
|
|
VERSION ${LIBRARY_VERSION}
|
|
SOVERSION ${LIBRARY_SOVERSION})
|
|
-TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS})
|
|
+TARGET_LINK_LIBRARIES(libh2o-evloop ${WSLAY_LIBRARIES} ${EXTRA_LIBS})
|
|
|
|
IF (OPENSSL_FOUND)
|
|
TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR})
|
|
@@ -553,7 +553,7 @@
|
|
ENDIF (OPENSSL_FOUND)
|
|
ENDIF (WITH_BUNDLED_SSL)
|
|
|
|
-ADD_CUSTOM_TARGET(check env H2O_ROOT=. BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove -v t/*.t
|
|
+ADD_CUSTOM_TARGET(check env H2O_ROOT=. BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove -I. -v t/*.t
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
DEPENDS h2o t-00unit-evloop.t)
|
|
IF (LIBUV_FOUND)
|
|
@@ -563,7 +563,7 @@
|
|
ENDIF ()
|
|
ENDIF ()
|
|
|
|
-ADD_CUSTOM_TARGET(check-as-root env H2O_ROOT=. BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove -v t/90root-*.t
|
|
+ADD_CUSTOM_TARGET(check-as-root env H2O_ROOT=. BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove -I. -v t/90root-*.t
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
|
IF (BUILD_FUZZER)
|