diff options
| author | Lucius Q. User <31438459+Lucius-Q-User@users.noreply.github.com> | 2021-06-21 23:29:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 13:29:58 -0700 |
| commit | d1d672d756f8d929ba1eedabd27e394517e88567 (patch) | |
| tree | dfc8ac362a9dbca6aea406670ddef487b4f1347e | |
| parent | a7d3367cecc90388409a080d7826ed02d08b4cdc (diff) | |
| download | vcpkg-d1d672d756f8d929ba1eedabd27e394517e88567.tar.gz vcpkg-d1d672d756f8d929ba1eedabd27e394517e88567.zip | |
[qt5-*] Make QT and dependents build on arm macos (#18567)
* [qt5-*] Make it build on ARM64 macos
* [qt5-base] update port version
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/qt5-base/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/q-/qt5-base.json | 5 |
4 files changed, 12 insertions, 2 deletions
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 551f328dd..25eeb2e5c 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -306,6 +306,11 @@ elseif(VCPKG_TARGET_IS_LINUX) endif() elseif(VCPKG_TARGET_IS_OSX) list(APPEND CORE_OPTIONS -fontconfig) + if("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "arm64") + FILE(READ "${SOURCE_PATH}/mkspecs/common/macx.conf" _tmp_contents) + string(REPLACE "QMAKE_APPLE_DEVICE_ARCHS = x86_64" "QMAKE_APPLE_DEVICE_ARCHS = arm64" _tmp_contents ${_tmp_contents}) + FILE(WRITE "${SOURCE_PATH}/mkspecs/common/macx.conf" ${_tmp_contents}) + endif() if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) else() diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 39e0c5586..0d0c32119 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 8, + "port-version": 9, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index ee6981b4d..cde55b95e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5090,7 +5090,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 8 + "port-version": 9 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index d20697394..6fda6b893 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2362119eaacd46f6d1b0d27bac82b8851d84448f", + "version-semver": "5.15.2", + "port-version": 9 + }, + { "git-tree": "78428fb3d23edf667e96afe8ea0292efc12e44a0", "version-semver": "5.15.2", "port-version": 8 |