From 26187d1bed865f472caa2dcd2f154a72f7f6d045 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 27 Mar 2018 09:09:38 -0700 Subject: [qt5-base] Fix pcre2 reference on non-Windows --- ports/qt5-base/fix-system-pcre2-linux.patch | 17 +++++++++++++++++ ports/qt5-base/portfile.cmake | 1 + 2 files changed, 18 insertions(+) create mode 100644 ports/qt5-base/fix-system-pcre2-linux.patch diff --git a/ports/qt5-base/fix-system-pcre2-linux.patch b/ports/qt5-base/fix-system-pcre2-linux.patch new file mode 100644 index 000000000..c5669a4c9 --- /dev/null +++ b/ports/qt5-base/fix-system-pcre2-linux.patch @@ -0,0 +1,17 @@ +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index a5a1b66..5a48a05 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -163,8 +163,10 @@ + "builds": { + "debug": "-lpcre2-16d", + "release": "-lpcre2-16" +- } +- } ++ }, ++ "condition": "config.win32" ++ }, ++ { "libs": "-lpcre2-16", "condition": "!config.win32" } + ] + }, + "pps": { diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index c398b4370..e01365fe9 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -44,6 +44,7 @@ vcpkg_apply_patches( PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-system-pcre2.patch" "${CMAKE_CURRENT_LIST_DIR}/fix-system-freetype.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-system-pcre2-linux.patch" ) # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings -- cgit v1.2.3