diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-07-06 11:28:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 11:28:04 -0700 |
| commit | 2a233a21b9ba174749fd076b5dac509b7f2cb0c9 (patch) | |
| tree | 9822d1f13ee9e6f8a189e3fb491f71d707c35adb | |
| parent | e82e56f27fe6a4953bb794bef702141e0146dd6d (diff) | |
| download | vcpkg-2a233a21b9ba174749fd076b5dac509b7f2cb0c9.tar.gz vcpkg-2a233a21b9ba174749fd076b5dac509b7f2cb0c9.zip | |
[pcre] Use vcpkg_from_sourceforge as a fallback (#12252)
* [pcre] Use vcpkg_from_sourceforge as a fallback
* Update ports/pcre/CONTROL
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
| -rw-r--r-- | ports/pcre/CONTROL | 3 | ||||
| -rw-r--r-- | ports/pcre/portfile.cmake | 35 |
2 files changed, 26 insertions, 12 deletions
diff --git a/ports/pcre/CONTROL b/ports/pcre/CONTROL index 97dd54c34..a36dec4e8 100644 --- a/ports/pcre/CONTROL +++ b/ports/pcre/CONTROL @@ -1,4 +1,5 @@ Source: pcre -Version: 8.44-4 +Version: 8.44 +Port-Version: 5 Homepage: https://www.pcre.org/ Description: Perl Compatible Regular Expressions diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index 903d82a76..fe989d660 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -1,21 +1,34 @@ set(PCRE_VERSION 8.44) +set(EXPECTED_SHA adddec1236b25ff1c90e73835c2ba25d60a5839cbde2d6be7838a8ec099f7443dede931dc39002943243e21afea572eda71ee8739058e72235a192e4324398f0) +set(PATCHES + # Fix CMake Deprecation Warning concerning OLD behavior for policy CMP0026 + # Suppress MSVC compiler warnings C4703, C4146, C4308, which fixes errors + # under x64-uwp and arm-uwp + pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.pcre.org/pub/pcre/pcre-${PCRE_VERSION}.zip" - "https://downloads.sourceforge.net/project/pcre/pcre/${PCRE_VERSION}/pcre-${PCRE_VERSION}.zip" FILENAME "pcre-${PCRE_VERSION}.zip" - SHA512 adddec1236b25ff1c90e73835c2ba25d60a5839cbde2d6be7838a8ec099f7443dede931dc39002943243e21afea572eda71ee8739058e72235a192e4324398f0 + SHA512 ${EXPECTED_SHA} + SILENT_EXIT ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - # Fix CMake Deprecation Warning concerning OLD behavior for policy CMP0026 - # Suppress MSVC compiler warnings C4703, C4146, C4308, which fixes errors - # under x64-uwp and arm-uwp - pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch -) +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/pcre + REF ${PCRE_VERSION} + FILENAME "pcre-${PCRE_VERSION}.zip" + SHA512 ${EXPECTED_SHA} + PATCHES ${PATCHES} + ) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} |