From 0b5982aaf21f16edeae0a4c4521b1b1dcb18874b Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 7 Mar 2019 09:37:19 +0000 Subject: [apr]Enable option "APR_INSTALL_PRIVATE_H" to build non-standard files. --- ports/apr/CONTROL | 2 +- ports/apr/fix-missing-headers.patch | 13 +++++++++++++ ports/apr/portfile.cmake | 6 ++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/apr/fix-missing-headers.patch 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 -- cgit v1.2.3 From 443579a0642dec70705f04412df0bbd55c606709 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 11 Mar 2019 01:40:17 +0000 Subject: [apr]remove enviroment variable "${CMAKE_CURRENT_LIST_DIR}" --- ports/apr/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 110f1a94c..8d2b7bd40 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -17,7 +17,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-missing-headers.patch + fix-missing-headers.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From fe626490f0f3537fc85f47f76d5bcd16ea539dea Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 12 Mar 2019 00:47:12 +0000 Subject: [apr]Modify cmake file instead of make a patch. --- ports/apr/fix-missing-headers.patch | 13 ------------- ports/apr/portfile.cmake | 8 +------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 ports/apr/fix-missing-headers.patch diff --git a/ports/apr/fix-missing-headers.patch b/ports/apr/fix-missing-headers.patch deleted file mode 100644 index 14986f001..000000000 --- a/ports/apr/fix-missing-headers.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 8d2b7bd40..51795c1a4 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -14,15 +14,9 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - fix-missing-headers.patch -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON + OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON -DAPR_INSTALL_PRIVATE_H=ON # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 -- cgit v1.2.3 From ff28cc2d220fdc58d4633f65f0bdf36f08df20db Mon Sep 17 00:00:00 2001 From: Griffin Downs Date: Tue, 12 Mar 2019 13:37:08 -0700 Subject: Express install private headers as feature --- ports/apr/CONTROL | 3 +++ ports/apr/portfile.cmake | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL index 18d4f36cf..0327d6c75 100644 --- a/ports/apr/CONTROL +++ b/ports/apr/CONTROL @@ -1,3 +1,6 @@ Source: apr 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. + +Feature: private-headers +Description: Install non-standard files required for building Apache httpd \ No newline at end of file diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 51795c1a4..697c68cce 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -14,9 +14,15 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) +set(OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON) + +if("private-headers" IN_LIST FEATURES) + set(OPTIONS ${OPTIONS} -DAPR_INSTALL_PRIVATE_H=ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON -DAPR_INSTALL_PRIVATE_H=ON + OPTIONS ${OPTIONS} # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 -- cgit v1.2.3 From 57cf77dc7287ee317aff364e37d5040a86245fc6 Mon Sep 17 00:00:00 2001 From: Griffin Downs Date: Tue, 12 Mar 2019 13:51:52 -0700 Subject: Add newline --- ports/apr/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL index 0327d6c75..19be22b19 100644 --- a/ports/apr/CONTROL +++ b/ports/apr/CONTROL @@ -3,4 +3,4 @@ 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. Feature: private-headers -Description: Install non-standard files required for building Apache httpd \ No newline at end of file +Description: Install non-standard files required for building Apache httpd -- cgit v1.2.3 From 6880f4e6e3abc556636d00925cd50716b9ad570c Mon Sep 17 00:00:00 2001 From: Griffin Downs Date: Tue, 12 Mar 2019 14:26:38 -0700 Subject: Remove options var; Create var for setting APR_INSTALL_PRIVATE_H --- ports/apr/portfile.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 697c68cce..1e9de7ffb 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -14,15 +14,19 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -set(OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON) - if("private-headers" IN_LIST FEATURES) - set(OPTIONS ${OPTIONS} -DAPR_INSTALL_PRIVATE_H=ON) + set(INSTALL_PRIVATE_H ON) +else() + set(INSTALL_PRIVATE_H OFF) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${OPTIONS} + OPTIONS + -DINSTALL_PDB=OFF + -DMIN_WINDOWS_VER=Windows7 + -DAPR_HAVE_IPV6=ON + -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H} # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 -- cgit v1.2.3