Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[qt5-base & qtbase] Fix error on arm64-windows #41536

Merged
merged 10 commits into from
Oct 24, 2024

Conversation

pedrolcl
Copy link
Contributor

Patch by Oliver Wolff:
qt/qtbase@b66ecb2

qmake has been fixed in 6.8, but all other versions need to be patched for arm64.

The original report is about qt5-base: Build error on arm64-windows. but this PR also adds the same patch to Qt6.

Fixes #37210

Patch by Oliver Wolff:
qt/qtbase@b66ecb2

qmake has been fixed in 6.8, but all other versions need to be patched for arm64.

The original report is about qt5-base: Build error on arm64-windows. but this PR also adds the same patch to Qt6.
@cenit
Copy link
Contributor

cenit commented Oct 13, 2024

you need to bump (add a 1 to the number there or create it with value 1 if missing) "port-version" for both qt5-base/vcpkg.json and qtbase/vcpkg.json

@cenit
Copy link
Contributor

cenit commented Oct 13, 2024

and vcpkg team should move to test arm64_windows on real arm64_windows ;)

@MonicaLiu0311
Copy link
Contributor

MonicaLiu0311 commented Oct 14, 2024

you need to bump (add a 1 to the number there or create it with value 1 if missing) "port-version" for both qt5-base/vcpkg.json and qtbase/vcpkg.json

  1. The above modifications
  2. Please commit after modification
  3. Run ./vcpkg x-add-version testPort to generate a series of version according to your commit info (Add --overwrite-version when generating other than the first time)
    vcpkg/versions/
        t-/
            testport.josn (automatically generated)
        baseline.json (automatically add records)
    
  4. Commit verison information again
  5. Push together

maintainer-guide.md#versioning

@MonicaLiu0311 MonicaLiu0311 added the category:port-bug The issue is with a library, which is something the port should already support label Oct 14, 2024
@MonicaLiu0311 MonicaLiu0311 marked this pull request as draft October 14, 2024 02:42
@pedrolcl
Copy link
Contributor Author

and vcpkg team should move to test arm64_windows on real arm64_windows ;)

Hi! Thanks everyone for the feedback. What do you mean, that the CI build of 'arm64_windows` is not performed on real ARM64 hardware, or in Windows OS?

I did build Qt5 locally on my new Surface Pro 11, with Snapdragon® X Elite and Windows 11. I want to use this device to port and test my software to windows+arm64. That is why I've opened this PR.

The build time on the CI server ( qt5-base:x64-windows: SUCCEEDED: 8 min) is good enough for me, and matches the build time I got on the Surface.

@pedrolcl pedrolcl marked this pull request as ready for review October 14, 2024 19:40
@dg0yt
Copy link
Contributor

dg0yt commented Oct 14, 2024

and vcpkg team should move to test arm64_windows on real arm64_windows ;)

Hi! Thanks everyone for the feedback. What do you mean, that the CI build of 'arm64_windows` is not performed on real ARM64 hardware, or in Windows OS?

vcpkg CI does arm64-windows as a cross build on x64-windows. So there is no native testing on arm64 windows hosts.

(And some ports are hard to adapt to vcpkg's cross-build pattern. qt5-base is such a port.)

@pedrolcl
Copy link
Contributor Author

Can somebody tell me why the arm64_osx build has failed? or is there a build log that I can access?

@cenit
Copy link
Contributor

cenit commented Oct 14, 2024

Can somebody tell me why the arm64_osx build has failed? or is there a build log that I can access?

in the azure pipeline you can find everything.
Here the artifacts with the published logs
https://dev.azure.com/vcpkg/c1ee48cb-0df2-4ab3-8384-b1df5a79fe53/_apis/build/builds/108037/artifacts?artifactName=failure%20logs%20for%20arm64-osx&api-version=7.1&%24format=zip

@pedrolcl
Copy link
Contributor Author

Can somebody tell me why the arm64_osx build has failed? or is there a build log that I can access?

in the azure pipeline you can find everything. Here the artifacts with the published logs https://dev.azure.com/vcpkg/c1ee48cb-0df2-4ab3-8384-b1df5a79fe53/_apis/build/builds/108037/artifacts?artifactName=failure%20logs%20for%20arm64-osx&api-version=7.1&%24format=zip

Thanks. I see that there is a missing header that couldn't be installed. It does not explain why yesterday the same build succeeded.

MonicaLiu0311
MonicaLiu0311 previously approved these changes Oct 15, 2024
The patches here were not authored by me. These were the original headers:

From b66ecb295ecc3981b1c21f01d62c9066f5d6e6ca Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Mon, 15 Jul 2024 09:31:30 +0200
Subject: [PATCH 1/1] qmake: Add support for arm64 hosts on Windows

Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com>
@BillyONeal
Copy link
Member

/azp run

@BillyONeal
Copy link
Member

Rerunning due to network mistake last night.

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@MonicaLiu0311 MonicaLiu0311 changed the title Fixes for qt5-base, and qtbase: Build error on arm64-windows [qt5-base & qtbase] Fix error on arm64-windows Oct 17, 2024
versions/q-/qtbase.json Outdated Show resolved Hide resolved
Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com>
@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Oct 23, 2024
@data-queue data-queue merged commit 1d6bcca into microsoft:master Oct 24, 2024
16 checks passed
@pedrolcl pedrolcl deleted the fix-qmake branch October 24, 2024 04:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[qt5-base] Build error on arm64-windows
6 participants