Skip to content

[qt5-base] fix x64-osx -> arm64-osx cross compile#18870

Closed
ghost wants to merge 1 commit intomasterfrom
unknown repository
Closed

[qt5-base] fix x64-osx -> arm64-osx cross compile#18870
ghost wants to merge 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Jul 8, 2021

Make it possible to cross-compile qt5-base from x64 mac to arm64 by detecting cross compilation and passing the correct flags

  • What does your PR fix?

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    osx, Yes

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

@ghost
Copy link
Author

ghost commented Jul 8, 2021

Somewhat depends on #18630 , #18625 and #18608

@JackBoosY JackBoosY added category:port-bug The issue is with a library, which is something the port should already support depends:different-pr This PR or Issue depends on a PR which has been filed labels Jul 9, 2021
@ghost ghost marked this pull request as ready for review July 9, 2021 16:24
@JackBoosY
Copy link
Contributor

Any progress?

@ghost
Copy link
Author

ghost commented Sep 30, 2021

Right now the problem is that fontconfig fails to cross compile from x86 to arm. I can rebase this patch, but if merged without fontconfig fixes, it is kinda useless, since the dependencies can't cross compile.

@JackBoosY
Copy link
Contributor

cc @Neumann-A

github-actions[bot]
github-actions bot previously approved these changes Jan 12, 2022
@JackBoosY
Copy link
Contributor

Does this PR no longer depend on other PRs? I see the checks are okay now.

@ghost
Copy link
Author

ghost commented Jan 13, 2022

It can be merged now.

@JackBoosY JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Jan 13, 2022
@JackBoosY
Copy link
Contributor

@Neumann-A Do you against this changes?

@Neumann-A
Copy link
Contributor

@Neumann-A Do you against this changes?

only against the changes which removes the removal of the third party deps. These folders are removed to not accidentally build them.

@ghost
Copy link
Author

ghost commented Mar 5, 2022

Qt's build system really wants to use vendored zlib to compile the bootstrap binary (the actual arm64 binary uses system zlib). And i haven't been able to convince it to use system zlib for that.

@JackBoosY
Copy link
Contributor

Any progress?
Can you please merge to master?

for (k, $${currentConfig}.output.$${type}.assign._KEYS_): \
+ {
$${currentConfig}.output.$$type += "$$k = $$eval($${currentConfig}.output.$${type}.assign.$$k)"
+ equals(k, "QMAKE_LIBS_ZLIB"): $${currentConfig}.output.$$type += "host_build:qtConfig(system-zlib): $$k = -lz"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of -lz, we need the value of ZLIB_LIBS.

patches/mysql-configure.patch #Fix mysql project
patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547
patches/arm64-osx.patch #Make it build on arm64 macos
patches/host-zlib.patch #Make the build system use host zlib instead of vendored one
Copy link
Contributor

@dg0yt dg0yt Mar 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, indentation.

@JackBoosY
Copy link
Contributor

Convert this PR to draft since there is no progress.

@JackBoosY
Copy link
Contributor

Closing this PR since it seems that no progress is being made. Please reopen if work is still being done.

@JackBoosY JackBoosY closed this Jun 24, 2022
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants