qt: bump dependencies + modernize #9337
Conversation
| @@ -1227,6 +1271,8 @@ def _create_plugin(pluginname, libname, type, requires): | |||
| self.cpp_info.components[component].exelinkflags.extend(obj_files) | |||
| self.cpp_info.components[component].sharedlinkflags.extend(obj_files) | |||
|
|
|||
| self.cpp_info.set_property("cmake_build_modules", build_modules) | |||
There was a problem hiding this comment.
why isn't this done per-component ?
There was a problem hiding this comment.
There was a problem hiding this comment.
In the meantime, since 1.44.1 cmake_build_modules per component works properly again: conan-io/conan#10326
recipes/qt/5.x.x/conanfile.py
Outdated
| if not tools.cross_building(self, skip_x64_x86=True): | ||
| self.requires("xkbcommon/1.3.0") | ||
| self.requires("xkbcommon/1.3.1") |
There was a problem hiding this comment.
Out of scope of this PR, but requirements() shouldn't have logic based on tools.cross_building(), but only options and host settings.
There was a problem hiding this comment.
ahah:
ERROR:
ConanException: qt/6.2.2 package_info(): Package require 'xkbcommon' declared in components requires but not defined as a recipe requirement
This comment has been minimized.
This comment has been minimized.
| @@ -368,8 +368,7 @@ def requirements(self): | |||
| self.requires("libalsa/1.2.5.1") | |||
| if self.options.gui and self.settings.os in ["Linux", "FreeBSD"]: | |||
| self.requires("xorg/system") | |||
| if not tools.cross_building(self, skip_x64_x86=True): | |||
| self.requires("xkbcommon/1.3.1") | |||
| self.requires("xkbcommon/1.3.1") | |||
There was a problem hiding this comment.
this will break all cross compilation scenarii (involving Linux/FreeBSD and GUI), because xkbcommon is built with meson, which conan is not yet able to configure for cross-compilation
There was a problem hiding this comment.
it's already broken since xkbcommon is missing, while it's required. It doesn't make sense to have logic based on tools.cross_building in requirements().
Moreover, xorg recipe can't be cross-compiled either, so you can consider that cross-build to Linux is broken anyway.
There was a problem hiding this comment.
It's been a long time since I tested it, but it worked at least partially. Requirements can depend on settings, so I don't get why tools.cross_building would be forbidden in requirements(self)
There was a problem hiding this comment.
Because requirements are host dependencies, they don't care of build machine, what would it mean to not require a dependency if cross-building, then require it at consume time if someone use the package on its machine?
There was a problem hiding this comment.
Well, you surely don't end up with the same package if you cross-compile and if you compile natively, but it's better than having no possibility to cross compile at all. For qt6, It's fine because cross-compilation is already broken, but for qt5 if you want to go down this road, then we need to add a with_xkbcommon option, and force this option to false when cross compiling
There was a problem hiding this comment.
I think you have reached the agreement, as Eric approved it, so I am comfortable approving it as well (I am not very much in Qt nowadays, but from the generic CCI perspective it looks fine)
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
All green in build 5 (
|
conan-center hook activated.