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.

Sign up for GitHub

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

Jump to bottom

qt: backport support for pkgconfig files on macOS #208064

Merged
merged 2 commits into from
Feb 21, 2025
Merged

qt: backport support for pkgconfig files on macOS #208064

merged 2 commits into from
Feb 21, 2025
+69 −96

Conversation

cho-m
Copy link
Member

@cho-m cho-m commented Feb 17, 2025 •
edited
Loading

Changes:

  • Backported support for pkgconfig files and dropped previous workaround. This also means we no longer need to install into libexec.
  • Moved down ENV.runtime_cpu_detection to reduce scope
  • Replaced configure helper script with direct CMake args (https://github.com/qt/qtbase/blob/dev/cmake/configure-cmake-mapping.md?plain=1). Mainly helps when splitting submodules as configure script is only for super-project.
  • Dropped -DQT_FEATURE_webengine_vulkan=OFF
  • Dropped -DQT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX=#{prefix}. Didn't seem necessary anymore and would alter QT_INSTALL_PREFIX
  • Specify the Qt modules in variable to avoid handling webengine multiple times.
  • Checked that QT_INSTALL_PREFIX is HOMEBREW_PREFIX since it is needed supporting formula split

@github-actions github-actions bot added nodejs Node or npm use is a significant feature of the PR or issue CI-linux-self-hosted Build on Linux self-hosted runner long build Set a long timeout for formula testing icu4c ICU use is a significant feature of the PR or issue ffmpeg FFMPEG use is a significant feature of the PR or issue long dependent tests Set a long timeout for dependent testing labels Feb 17, 2025
@cho-m cho-m force-pushed the qt-pkgconf branch 4 times, most recently from e7b062a to d2e10be Compare February 18, 2025 21:27
@cho-m cho-m marked this pull request as ready for review February 18, 2025 21:27
@cho-m cho-m changed the title qt: apply patch from code review to install pkgconfig files on macOS qt: backport support for pkgconfig files on macOS Feb 18, 2025
@cho-m
qt: backport support for pkgconfig files on macOS
e9214a7 
Also:
* switch configure args to cmake args
* re-enable webengine vulkan feature on macOS
* add test for pkgconfig files
@cho-m cho-m mentioned this pull request Feb 21, 2025
Merged
6 tasks
@github-actions GitHub Actions
Copy link
Contributor

🤖 An automated task has requested bottles to be published to this PR.

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label Feb 21, 2025
@BrewTestBot BrewTestBot added this pull request to the merge queue Feb 21, 2025
Merged via the queue into master with commit 61e460d Feb 21, 2025
15 checks passed
@BrewTestBot BrewTestBot deleted the qt-pkgconf branch February 21, 2025 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] approved these changes

@p-linnane p-linnane p-linnane approved these changes

Assignees
No one assigned
Labels
CI-linux-self-hosted Build on Linux self-hosted runner CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. ffmpeg FFMPEG use is a significant feature of the PR or issue icu4c ICU use is a significant feature of the PR or issue long build Set a long timeout for formula testing long dependent tests Set a long timeout for dependent testing nodejs Node or npm use is a significant feature of the PR or issue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cho-m @p-linnane @BrewTestBot