From 95549f64bb26b7a27ed27028309fd3760dde5f83 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Mon, 8 Feb 2016 14:21:56 +0100 Subject: Do not add -target to a cross build qmake. Otherwise qmake isn't installed correctly to the sysroot. Change-Id: If4883471d99e036be405018dcd8441b7b507283e Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 6 +----- .../qtbase/0002-configure-Separate-host-and-build-platform.patch | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 93cc1388..b9e41ab5 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -37,10 +37,6 @@ Subject: [PATCH 1/9] Add linux-oe-g++ platform /bin/sh: line 0: test: -gt: unary operator expected which are not fatal, but still misleading in do_configure output -* add -target suffix to qmake built in qtbase configure, this way we can - use qmake from qtbase-native, but then include qmake built for target - in qtbase-tools package (smilarly for nativesdk-qtbase). - Upstream-Status: Inappropriate [embedded specific] too OE specific, probably cannot be upstreamed @@ -184,7 +180,7 @@ index 16e8fb4..9897fe6 100755 \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" EXEEXT= -+ [ "$QT_CROSS_COMPILE" = "yes" ] && EXEEXT=-target ++ fi if [ "$BUILD_ON_MAC" = "yes" ]; then echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" diff --git a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch index 4ff1643f..557cffa8 100644 --- a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch +++ b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch @@ -254,7 +254,7 @@ index 52c1be2..6b89d34 100755 @@ -4068,7 +4103,8 @@ \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" EXEEXT= - [ "$QT_CROSS_COMPILE" = "yes" ] && EXEEXT=-target + - fi + ;; + esac -- cgit v1.2.3-54-g00ecf