whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable PCRE2 JIT on macOS ARM64 

It's already disabled for many other ARM platforms, and upstream
support for Apple Silicon is still pending, so we disable it for
now. See: https://bugs.exim.org/show_bug.cgi?id=2618

Fixes: QTBUG-85528
Pick-to: 5.15
Pick-to: 5.12
Change-Id: I42b6e5efaa07c9b832cd05a47436eb86a214e9bf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Tor Arne Vestbø 2020-07-10 18:37:29 +02:00
parent e80be8a43d
commit 2f8df4d1a8
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/3rdparty/pcre2/.prev_CMakeLists.txt vendored
View File

@ -67,10 +67,15 @@ qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64"
PCRE2_DISABLE_JIT
)
qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64")
DEFINES
PCRE2_DISABLE_JIT
)
qt_extend_target(BundledPcre2 CONDITION WIN32
PUBLIC_DEFINES
PCRE2_STATIC
)
#### Keys ignored in scope 7:.:.:pcre2.pri:QT_FEATURE_intelcet:
#### Keys ignored in scope 8:.:.:pcre2.pri:QT_FEATURE_intelcet:
# QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK"

7
src/3rdparty/pcre2/CMakeLists.txt vendored
View File

@ -67,12 +67,17 @@ qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64"
PCRE2_DISABLE_JIT
)
qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64")
DEFINES
PCRE2_DISABLE_JIT
)
qt_extend_target(BundledPcre2 CONDITION WIN32
PUBLIC_DEFINES
PCRE2_STATIC
)
#### Keys ignored in scope 7:.:.:pcre2.pri:QT_FEATURE_intelcet:
#### Keys ignored in scope 8:.:.:pcre2.pri:QT_FEATURE_intelcet:
# QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK"
# special case begin

1
src/3rdparty/pcre2/pcre2.pro vendored
View File

@ -11,5 +11,6 @@ include(pcre2.pri)
uikit|qnx: DEFINES += PCRE2_DISABLE_JIT
win32:contains(QT_ARCH, "arm"): DEFINES += PCRE2_DISABLE_JIT
win32:contains(QT_ARCH, "arm64"): DEFINES += PCRE2_DISABLE_JIT
macos:contains(QT_ARCH, "arm64"): DEFINES += PCRE2_DISABLE_JIT
load(qt_helper_lib)