summaryrefslogtreecommitdiffstats
path: root/build/external/patches/quicly_0.0.2-vpp
diff options
context:
space:
mode:
Diffstat (limited to 'build/external/patches/quicly_0.0.2-vpp')
-rw-r--r--build/external/patches/quicly_0.0.2-vpp/0001-cmake-install.patch57
-rw-r--r--build/external/patches/quicly_0.0.2-vpp/0002-close-update-now.patch12
2 files changed, 0 insertions, 69 deletions
diff --git a/build/external/patches/quicly_0.0.2-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.2-vpp/0001-cmake-install.patch
deleted file mode 100644
index 3ac90c7d0aa..00000000000
--- a/build/external/patches/quicly_0.0.2-vpp/0001-cmake-install.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 202cc52..b5c2bee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,6 +40,8 @@ SET(UNITTEST_SOURCE_FILES
- t/stream-concurrency.c
- t/test.c)
-
-+SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+
- ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES})
-
- ADD_EXECUTABLE(cli ${PICOTLS_OPENSSL_FILES} src/cli.c)
-@@ -50,6 +52,16 @@ TARGET_LINK_LIBRARIES(test.t quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS})
-
- ADD_EXECUTABLE(udpfw t/udpfw.c)
-
-+INSTALL (
-+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/
-+ DESTINATION include
-+ FILES_MATCHING PATTERN "*.h")
-+
-+INSTALL(TARGETS quicly
-+ RUNTIME DESTINATION bin
-+ LIBRARY DESTINATION lib
-+ ARCHIVE DESTINATION lib)
-+
- ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS cli test.t)
-Submodule deps/picotls contains untracked content
-Submodule deps/picotls contains modified content
-diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt
-index cda6aad..62b23b7 100644
---- a/deps/picotls/CMakeLists.txt
-+++ b/deps/picotls/CMakeLists.txt
-@@ -5,6 +5,7 @@ PROJECT(picotls)
-
- FIND_PACKAGE(PkgConfig REQUIRED)
-
-+SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
- SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}")
- INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR} deps/cifra/src/ext deps/cifra/src deps/micro-ecc deps/picotest include)
- SET(MINICRYPTO_LIBRARY_FILES
-@@ -97,3 +98,12 @@ IF (BUILD_FUZZER)
-
-
- ENDIF()
-+
-+INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/
-+ DESTINATION include
-+ FILES_MATCHING PATTERN "*.h")
-+
-+INSTALL(TARGETS picotls-core picotls-openssl
-+ RUNTIME DESTINATION bin
-+ LIBRARY DESTINATION lib
-+ ARCHIVE DESTINATION lib)
diff --git a/build/external/patches/quicly_0.0.2-vpp/0002-close-update-now.patch b/build/external/patches/quicly_0.0.2-vpp/0002-close-update-now.patch
deleted file mode 100644
index 27b54a6105b..00000000000
--- a/build/external/patches/quicly_0.0.2-vpp/0002-close-update-now.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/quicly.c b/lib/quicly.c
-index fac85f2..80e1bcd 100644
---- a/lib/quicly.c
-+++ b/lib/quicly.c
-@@ -3240,6 +3240,7 @@ static int initiate_close(quicly_conn_t *conn, int err, uint64_t frame_type, con
- int quicly_close(quicly_conn_t *conn, int err, const char *reason_phrase)
- {
- assert(err == 0 || QUICLY_ERROR_IS_QUIC_APPLICATION(err));
-+ update_now(conn->super.ctx);
-
- return initiate_close(conn, err, QUICLY_FRAME_TYPE_PADDING /* used when err == 0 */, reason_phrase);
- }