From b562ba020288c0baaa2b08f33317dec6895fb63c Mon Sep 17 00:00:00 2001 From: John Date: Tue, 2 Jul 2019 00:52:53 +0200 Subject: [PATCH] common/build-style/qmake: use custom qt.conf for cross compiling [ci skip] --- common/build-style/qmake.sh | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh index ef8b87db730..63be5a3a568 100644 --- a/common/build-style/qmake.sh +++ b/common/build-style/qmake.sh @@ -3,6 +3,7 @@ # do_configure() { local qmake + local qmake_args if [ -x "/usr/lib/qt5/bin/qmake" ]; then # Qt5 qmake qmake="/usr/lib/qt5/bin/qmake" @@ -14,7 +15,35 @@ do_configure() { if [ -z "${qmake}" ]; then msg_error "${pkgver}: Could not find qmake - missing in hostdepends?\n" fi - ${qmake} ${configure_args} \ + if [ "$CROSS_BUILD" ] && [ "$qmake" == "/usr/lib/qt5/bin/qmake" ]; then + cat > "${wrksrc}/qt.conf" <<_EOF +[Paths] +Sysroot=${XBPS_CROSS_BASE} +Prefix=${XBPS_CROSS_BASE}/usr +ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5 +Data=${XBPS_CROSS_BASE}/usr/share/qt5 +Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5 +Headers=${XBPS_CROSS_BASE}/usr/include/qt5 +Libraries=${XBPS_CROSS_BASE}/usr/lib +LibraryExecutables=/usr/lib/qt5/libexec +Binaries=/usr/lib/qt5/bin +Tests=${XBPS_CROSS_BASE}/usr/tests +Plugins=/usr/lib/qt5/plugins +Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports +Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml +Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations +Settings=${XBPS_CROSS_BASE}/etc/xdg +Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples +HostPrefix=/usr +HostData=/usr/lib/qt5 +HostBinaries=/usr/lib/qt5/bin +HostLibraries=/usr/lib +Spec=linux-g++ +TargetSpec=linux-g++ +_EOF + qmake_args="-qtconf ${wrksrc}/qt.conf" + fi + ${qmake} ${qmake_args} ${configure_args} \ PREFIX=/usr \ LIB=/usr/lib \ QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \