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-location] Rename vendored libs to avoid conflicts #13451

Merged
merged 8 commits into from
Sep 26, 2020

Conversation

ras0219
Copy link
Contributor

@ras0219 ras0219 commented Sep 10, 2020

Extracted from #12199

@Neumann-A
Copy link
Contributor

Use upstream patch instead: https://codereview.qt-project.org/c/qt/qtlocation/+/312221 ?
Just need to figure out which patchset applies to qt 5.15

@JackBoosY JackBoosY self-assigned this Sep 11, 2020
@JackBoosY JackBoosY added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Sep 14, 2020
@BillyONeal
Copy link
Member

Is this why we've been getting those intermittent failures of qt stuff?

@JackBoosY
Copy link
Contributor

@BillyONeal Part of these regressions.

ports/qt5-location/CONTROL Outdated Show resolved Hide resolved
@ras0219-msft ras0219-msft merged commit 501e44e into microsoft:master Sep 26, 2020
@ras0219-msft
Copy link
Contributor

@BillyONeal This should only affect qt5-location; this doesn't explain any other random Qt failures

@ras0219 ras0219 deleted the dev/roschuma/qt5-location branch September 26, 2020 12:12
@JackBoosY
Copy link
Contributor

Most random qt build failures are due to parallel builds.

@markridgewell
Copy link

@ras0219-msft I think this change broke my code (specifically this commit: 208666f).

It seems that Assimp now links against the entire Irrlicht engine, rather than just IrrXML, but since Irrlicht defines WndProc, I get a linker error:

Irrlicht.lib(CIrrDeviceWin32.cpp.obj) : error LNK2005: "__int64 __cdecl WndProc(struct HWND__ *,unsigned int,unsigned __int64,__int64)" (?WndProc@@YA_JPEAUHWND__@@I_K_J@Z) already defined

It looks like Assimp doesn't require Irrlicht as a dependency, only IrrXML: https://github.com/assimp/assimp/blob/95d0443a5d8417051844ddfff9ad9a013b66abd9/cmake-modules/FindIrrXML.cmake

@JackBoosY
Copy link
Contributor

cc @ras0219

@markridgewell
Copy link

Hi, I managed to work around the issue by putting my WndProc in an anonymous namespace, but I'm still not sure it's a good idea to add the whole of Irrlicht as a dependency here if it can be avoided.

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:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants