summaryrefslogtreecommitdiffstats
path: root/build/external/patches/quicly_0.0.1-vpp/0001-cmake-install.patch
diff options
context:
space:
mode:
authorAloys Augustin <aloaugus@cisco.com>2019-04-01 16:43:29 +0200
committerDave Wallace <dwallacelf@gmail.com>2019-04-03 13:27:31 +0000
commit7cae003a68ed3e1022bcc8d33d0b5375918a83f7 (patch)
tree925ea0ad3065bf349512f6caf684ad64be92262c /build/external/patches/quicly_0.0.1-vpp/0001-cmake-install.patch
parent02ad5bc0a83c8b26e8210ebab1e8691d8be39660 (diff)
QUIC: Build system update
Download a single tarball with the sources of quicly and its dependencies from github instead of cloning submodules. Change-Id: Id9955565d46f595b3a14ba3408c24045d4acd296 Signed-off-by: Aloys Augustin <aloaugus@cisco.com>
Diffstat (limited to 'build/external/patches/quicly_0.0.1-vpp/0001-cmake-install.patch')
-rw-r--r--build/external/patches/quicly_0.0.1-vpp/0001-cmake-install.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/build/external/patches/quicly_0.0.1-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.1-vpp/0001-cmake-install.patch
new file mode 100644
index 00000000000..3ac90c7d0aa
--- /dev/null
+++ b/build/external/patches/quicly_0.0.1-vpp/0001-cmake-install.patch
@@ -0,0 +1,57 @@
+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)