diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-07-02 23:52:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 23:52:04 -0700 |
| commit | 3d2a7ca33e9997051ea221c30ccd4835989879ad (patch) | |
| tree | 73f35faf45f9216202332000e13a1a4ae6a86b64 | |
| parent | 485799e37b42961042b02bfe613c97d43ac757bc (diff) | |
| download | vcpkg-3d2a7ca33e9997051ea221c30ccd4835989879ad.tar.gz vcpkg-3d2a7ca33e9997051ea221c30ccd4835989879ad.zip | |
[pcre2] Restore the https://ftp.pcre.org/ mirror in addition to the SourceForge mirrors. (#12233)
| -rw-r--r-- | ports/pcre2/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pcre2/portfile.cmake | 35 |
2 files changed, 27 insertions, 10 deletions
diff --git a/ports/pcre2/CONTROL b/ports/pcre2/CONTROL index b8109b744..8349c88a2 100644 --- a/ports/pcre2/CONTROL +++ b/ports/pcre2/CONTROL @@ -1,4 +1,4 @@ Source: pcre2 -Version: 10.30-8 +Version: 10.30-9 Homepage: https://pcre.org/ Description: PCRE2 is a re-working of the original Perl Compatible Regular Expressions library diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index 23c7d16f0..bbb3d318e 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -1,17 +1,34 @@ set(PCRE2_VERSION 10.30) - -vcpkg_from_sourceforge( - OUT_SOURCE_PATH SOURCE_PATH - REPO pcre/pcre2 - REF ${PCRE2_VERSION} - FILENAME "pcre2-${PCRE2_VERSION}.zip" - SHA512 03e570b946ac29498a114b27e715a0fcf25702bfc9623f9fc085ee8a3214ab3c303baccb9c0af55da6916e8ce40d931d97f1ee9628690563041a943f0aa2bc54 - PATCHES +set(EXPECTED_SHA 03e570b946ac29498a114b27e715a0fcf25702bfc9623f9fc085ee8a3214ab3c303baccb9c0af55da6916e8ce40d931d97f1ee9628690563041a943f0aa2bc54) +set(PATCHES fix-space.patch fix-arm64-config.patch - fix-uwp.patch + fix-uwp.patch) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.pcre.org/pub/pcre/pcre2-${PCRE2_VERSION}.zip" + FILENAME "pcre2-${PCRE2_VERSION}.zip" + SHA512 ${EXPECTED_SHA} + SILENT_EXIT ) +if (EXISTS "${ARCHIVE}") + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES ${PATCHES} + ) +else() + vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO pcre/pcre2 + REF ${PCRE2_VERSION} + FILENAME "pcre2-${PCRE2_VERSION}.zip" + SHA512 ${EXPECTED_SHA} + PATCHES ${PATCHES} + ) +endif() + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") set(JIT OFF) else() |