Message ID | 20241213115820.655993-2-roykollensvendsen@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/8] package/qt6: bump version to 6.8.1 | expand |
On Fri, 13 Dec 2024 12:58:09 +0100 Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote: > As for the other parameters, BUILD_WITH_PCH, QT_BUILD_EXAMPLES and > QT_BUILD_TESTS, I don't see a good enough reason for breaking the > the existing pattern for only these two packages. I've applied, but it would be good to check if tests/examples are built by default or not, as building those for the host packages isn't really useful. Thomas
diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk index ecf14d3323..edec67649f 100644 --- a/package/qt6/qt6declarative/qt6declarative.mk +++ b/package/qt6/qt6declarative/qt6declarative.mk @@ -35,12 +35,6 @@ QT6DECLARATIVE_CONF_OPTS = \ -DQT_BUILD_EXAMPLES=OFF \ -DQT_BUILD_TESTS=OFF -HOST_QT6DECLARATIVE_CONF_OPTS = \ - -DQT_HOST_PATH=$(HOST_DIR) \ - -DBUILD_WITH_PCH=OFF \ - -DQT_BUILD_EXAMPLES=OFF \ - -DQT_BUILD_TESTS=OFF - HOST_QT6DECLARATIVE_DEPENDENCIES = \ host-qt6base diff --git a/package/qt6/qt6opcua/qt6opcua.mk b/package/qt6/qt6opcua/qt6opcua.mk index 6c8ff7af89..28771ba8a5 100644 --- a/package/qt6/qt6opcua/qt6opcua.mk +++ b/package/qt6/qt6opcua/qt6opcua.mk @@ -28,10 +28,6 @@ QT6OPCUA_CONF_OPTS = \ -DQT_HOST_PATH=$(HOST_DIR) \ -DBUILD_WITH_PCH=OFF -HOST_QT6OPCUA_CONF_OPTS = \ - -DQT_HOST_PATH=$(HOST_DIR) \ - -DBUILD_WITH_PCH=OFF - QT6OPCUA_DEPENDENCIES = \ qt6base \ host-qt6opcua
In the qt6opcua and qt6declarative packages we don't follow the same pattern for default CONF_OPTS as the other packages. For these two packages we specify QT_HOST_PATH, which I don't see any good reason for. On the contrary, in my experience, it causes build failures, when bumping Qt6, if you don't rebuild everything. See: - https://doc.qt.io/qt-6/cmake-variable-qt-host-path.html As for the other parameters, BUILD_WITH_PCH, QT_BUILD_EXAMPLES and QT_BUILD_TESTS, I don't see a good enough reason for breaking the the existing pattern for only these two packages. Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com> --- package/qt6/qt6declarative/qt6declarative.mk | 6 ------ package/qt6/qt6opcua/qt6opcua.mk | 4 ---- 2 files changed, 10 deletions(-)