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

[qtbase] Fix PACKAGE_PREFIX_DIR substitution, which was broken by CMake 3.29.1 #38088

Closed

Conversation

fwcd
Copy link
Contributor

@fwcd fwcd commented Apr 9, 2024

This substitution no longer works due to upstream changes in CMake, which changes the PACKAGE_PREFIX_DIR variable to a non-fixed name. Strangely I only ran into this issue while building an older vendored version of Qt submodule ports (see e.g. this build), but we should update this code anyway.

Checklist

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@fwcd fwcd marked this pull request as draft April 9, 2024 22:45
@fwcd fwcd marked this pull request as ready for review April 9, 2024 22:54
@fwcd
Copy link
Contributor Author

fwcd commented Apr 9, 2024

Since Qt generates the use of PACKAGE_PREFIX_DIR in Qt6CoreToolsAdditionalTargetInfo.cmake, this is an upstream issue too:

@dg0yt
Copy link
Contributor

dg0yt commented Apr 10, 2024

Duplicates #38017. Issue tracked in #37968.

@fwcd
Copy link
Contributor Author

fwcd commented Apr 10, 2024

The PR you linked fixes vcpkg-cmake-config, not qtbase, that's a different port

@dg0yt
Copy link
Contributor

dg0yt commented Apr 10, 2024

So this complements the other PR.
FTR re2 also needs a specific fix due to this variable.

@JonLiu1993 JonLiu1993 added the category:port-bug The issue is with a library, which is something the port should already support label Apr 11, 2024
@Neumann-A
Copy link
Contributor

close. Upstream CMake reverted the change

@fwcd
Copy link
Contributor Author

fwcd commented Apr 11, 2024

Maybe this patch would be a good idea regardless, to make the substituion robust against other variable names? Especially if Qt moves forward with their patch (regardless of what CMake is doing)

fwcd added a commit to fwcd/m1xxx that referenced this pull request Apr 12, 2024
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Apr 15, 2024
@JavierMatosD
Copy link
Contributor

Closing since CMake reverted the change. Since CMake is going to pursue a different solution for this problem, we shouldn't do this and we should support the new solution.

@fwcd
Copy link
Contributor Author

fwcd commented Apr 15, 2024

Did Qt also revert the change? I haven't checked, but if not, this is going to bite us on the next port update.

@Neumann-A
Copy link
Contributor

I think this string replacement no longer applies any way and could be removed in future updates

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.

None yet

5 participants