diff options
| author | JackBoosY <yuzaiyang@beyondsoft.com> | 2019-03-07 09:37:19 +0000 |
|---|---|---|
| committer | JackBoosY <yuzaiyang@beyondsoft.com> | 2019-03-07 09:37:21 +0000 |
| commit | 0b5982aaf21f16edeae0a4c4521b1b1dcb18874b (patch) | |
| tree | b6675b0c3be7ee883be44c0ebe8f04ae34779cef | |
| parent | d92ad530a99508e028de261eb13ad2319dbea3c4 (diff) | |
| download | vcpkg-0b5982aaf21f16edeae0a4c4521b1b1dcb18874b.tar.gz vcpkg-0b5982aaf21f16edeae0a4c4521b1b1dcb18874b.zip | |
[apr]Enable option "APR_INSTALL_PRIVATE_H" to build non-standard files.
| -rw-r--r-- | ports/apr/CONTROL | 2 | ||||
| -rw-r--r-- | ports/apr/fix-missing-headers.patch | 13 | ||||
| -rw-r--r-- | ports/apr/portfile.cmake | 6 |
3 files changed, 20 insertions, 1 deletions
diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL index b4ea1f213..18d4f36cf 100644 --- a/ports/apr/CONTROL +++ b/ports/apr/CONTROL @@ -1,3 +1,3 @@ Source: apr -Version: 1.6.5 +Version: 1.6.5-1 Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems. diff --git a/ports/apr/fix-missing-headers.patch b/ports/apr/fix-missing-headers.patch new file mode 100644 index 000000000..14986f001 --- /dev/null +++ b/ports/apr/fix-missing-headers.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b4632c3..d9e4eab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,7 @@ PROJECT(APR C)
+
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+-OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" OFF)
++OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" ON)
+ OPTION(APR_HAVE_IPV6 "IPv6 support" ON)
+ OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON)
+ OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF)
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 40ced3049..110f1a94c 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -14,6 +14,12 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/fix-missing-headers.patch +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON |