Mercurial > mxe-octave

changeset 6885:35588af48c94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt6 QtBase: Build bootstrap version with bundled PCRE2. * src/qt6-qtbase.mk: Build the "bootstrap" version (for cross-compiling) with the bundled version of PCRE2 instead of relying on the version installed on the build host.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 29 Sep 2023 17:37:14 +0200
parents 4f23ac562f62
children 3b1036b3713b
files src/qt6-qtbase.mk
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt6-qtbase.mk	Fri Sep 29 12:35:26 2023 +0200
+++ b/src/qt6-qtbase.mk	Fri Sep 29 17:37:14 2023 +0200
@@ -76,9 +76,9 @@
         -DCMAKE_INSTALL_PREFIX='$(BUILD_TOOLS_PREFIX)/qt6' \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)' \
         -DQT_BUILD_{TESTS,EXAMPLES,DOCS}=OFF \
-        -DFEATURE_pkg_config=OFF \
         -DBUILD_WITH_PCH=OFF \
-        -DFEATURE_{eventfd,glib,gui,icu,openssl,zstd,thread,pcre2,sql,xml,testlib,backtrace}=OFF; \
+        -DFEATURE_pcre2=ON \
+        -DFEATURE_{pkg_config,eventfd,glib,gui,icu,openssl,zstd,thread,system_pcre2,sql,xml,testlib,backtrace}=OFF; \
       cmake --build '$(1).native' -j '$(JOBS)'; \
       cmake --install '$(1).native'; \
     fi