diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-05-26 02:52:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-25 11:52:48 -0700 |
| commit | b271aeffa25c53f3750f58ad6209f3fa7c528716 (patch) | |
| tree | e2d85c56570965e26803b629502e9bcb7efa648d /ports/apr-util | |
| parent | 2ac2b5f3da6b46ff2ae900550bd7c44f39c57dcd (diff) | |
| download | vcpkg-b271aeffa25c53f3750f58ad6209f3fa7c528716.tar.gz vcpkg-b271aeffa25c53f3750f58ad6209f3fa7c528716.zip | |
[VCPKG baseline] Fix many ports (#11559)
Diffstat (limited to 'ports/apr-util')
| -rw-r--r-- | ports/apr-util/CONTROL | 2 | ||||
| -rw-r--r-- | ports/apr-util/portfile.cmake | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ports/apr-util/CONTROL b/ports/apr-util/CONTROL index c20e232bb..766aeb919 100644 --- a/ports/apr-util/CONTROL +++ b/ports/apr-util/CONTROL @@ -1,5 +1,5 @@ Source: apr-util -Version: 1.6.1 +Version: 1.6.1-1 Homepage: https://apr.apache.org/ Description: Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation Build-Depends: expat, apr, openssl diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake index 15b74d363..1065bdb72 100644 --- a/ports/apr-util/portfile.cmake +++ b/ports/apr-util/portfile.cmake @@ -1,4 +1,3 @@ - vcpkg_download_distfile(ARCHIVE URLS "http://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2" FILENAME "apr-util-1.6.1.tar.bz2" @@ -7,7 +6,6 @@ vcpkg_download_distfile(ARCHIVE ) if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} @@ -46,7 +44,6 @@ if(VCPKG_TARGET_IS_WINDOWS) file(WRITE ${CURRENT_PACKAGES_DIR}/include/apu.h "${APU_H}") else(VCPKG_TARGET_IS_WINDOWS) - vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} @@ -70,7 +67,7 @@ else(VCPKG_TARGET_IS_WINDOWS) NO_DEBUG OPTIONS "--prefix=${CURRENT_INSTALLED_DIR}" - "--with-apr=${CURRENT_INSTALLED_DIR}" + "--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr" "--with-openssl=${CURRENT_INSTALLED_DIR}" "-with-expat=${CURRENT_INSTALLED_DIR}" "${CONFIGURE_PARAMETER_1}" |