Skip to content

Commit cd8fa6f

Browse files
Merge pull request microsoft#2774 from cmpute/master
[pcre] fix space issue and add mirror (fix microsoft#2751)
2 parents fd7c589 + f676dbe commit cd8fa6f

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

ports/pcre2/CONTROL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Source: pcre2
2-
Version: 10.30-1
2+
Version: 10.30-2
33
Description: PCRE2 is a re-working of the original Perl Compatible Regular Expressions library

ports/pcre2/fix-space.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index fbc37fe..54e25f2 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -91,7 +91,7 @@ CMAKE_POLICY(SET CMP0026 OLD)
6+
7+
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake
8+
9+
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${PROJECT_SOURCE_DIR}/src")
10+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I\"${PROJECT_SOURCE_DIR}/src\"")
11+
12+
# external packages
13+
FIND_PACKAGE( BZip2 )

ports/pcre2/portfile.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set(PCRE2_VERSION 10.30)
22
include(vcpkg_common_functions)
33
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pcre2-${PCRE2_VERSION})
44
vcpkg_download_distfile(ARCHIVE
5-
URLS "https://sourceforge.net/projects/pcre/files/pcre2/${PCRE2_VERSION}/pcre2-${PCRE2_VERSION}.zip/download"
5+
URLS "https://ftp.pcre.org/pub/pcre/pcre2-${PCRE2_VERSION}.zip" "https://sourceforge.net/projects/pcre/files/pcre2/${PCRE2_VERSION}/pcre2-${PCRE2_VERSION}.zip/download"
66
FILENAME "pcre2-${PCRE2_VERSION}.zip"
77
SHA512 03e570b946ac29498a114b27e715a0fcf25702bfc9623f9fc085ee8a3214ab3c303baccb9c0af55da6916e8ce40d931d97f1ee9628690563041a943f0aa2bc54)
88

@@ -20,6 +20,9 @@ vcpkg_configure_cmake(
2020
-DPCRE2_BUILD_TESTS=OFF
2121
-DPCRE2_BUILD_PCRE2GREP=OFF)
2222

23+
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
24+
PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-space.patch)
25+
2326
vcpkg_install_cmake()
2427

2528
file(READ ${CURRENT_PACKAGES_DIR}/include/pcre2.h PCRE2_H)

0 commit comments

Comments
 (0)