Fix cross build again.

Thanks Helmut for the patch!
ci/unstable
Lisandro Damián Nicanor Pérez Meyer 1 year ago
parent 61db87ee03
commit 4515ed5f7c

9
debian/changelog vendored

@ -1,3 +1,12 @@
qt6-base (6.4.2+dfsg-18) UNRELEASED; urgency=medium
[ Helmut Grohne ]
* Fix FTCBFS: Do build sqlbrowser. (Closes: #1042709)
* Move from deprecated QT_BUILD_TOOLS_WHEN_CROSSCOMPILING to
QT_FORCE_BUILD_TOOLS.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 01 Aug 2023 19:47:16 -0300
qt6-base (6.4.2+dfsg-17) unstable; urgency=medium qt6-base (6.4.2+dfsg-17) unstable; urgency=medium
* Team upload. * Team upload.

@ -21,7 +21,17 @@
LABEL "Android deployment tool" LABEL "Android deployment tool"
PURPOSE "The Android deployment tool automates the process of creating Android packages." PURPOSE "The Android deployment tool automates the process of creating Android packages."
- CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression) - CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression)
+ CONDITION QT_FEATURE_regularexpression) + CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND QT_FEATURE_regularexpression)
qt_feature("macdeployqt" PRIVATE qt_feature("macdeployqt" PRIVATE
SECTION "Deployment" SECTION "Deployment"
--- a/examples/sql/CMakeLists.txt
+++ b/examples/sql/CMakeLists.txt
@@ -12,6 +12,6 @@ if(TARGET Qt::Xml)
qt_internal_add_example(masterdetail)
endif()
-if(NOT CMAKE_CROSSCOMPILING)
+if(QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING)
qt_internal_add_example(sqlbrowser)
endif()

2
debian/rules vendored

@ -24,7 +24,7 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
extra_cmake_args += \ extra_cmake_args += \
-DQT_HOST_PATH=/usr \ -DQT_HOST_PATH=/usr \
-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \ -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \
-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DQT_FORCE_BUILD_TOOLS=ON
endif endif
%: %:

Loading…
Cancel
Save