summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch
deleted file mode 100644
index 762cdaf978..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 549342fa380ed2a9ad41be3d04ee2f0585f6a465 Mon Sep 17 00:00:00 2001
2From: Michael Lauer <mickey@vanille-media.de>
3Date: Wed, 26 Sep 2012 20:41:32 +0200
4Subject: [PATCH 13/21] configure: add "-crossarch" option
5
6Upstream-Status: Pending
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9
10Update for qt 4.8.7
11
12Signed-off-by: Kai Kang <kai.kang@windriver.com>
13---
14 configure | 7 ++++++-
15 1 file changed, 6 insertions(+), 1 deletion(-)
16
17diff --git a/configure b/configure
18index 4eb4a3d..a4dacec 100755
19--- a/configure
20+++ b/configure
21@@ -1160,7 +1160,7 @@ while [ "$#" -gt 0 ]; do
22 shift
23 VAL=$1
24 ;;
25- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-psql_config|-sysroot)
26+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-psql_config|-sysroot|-crossarch)
27 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
28 shift
29 VAL="$1"
30@@ -1719,6 +1719,9 @@ while [ "$#" -gt 0 ]; do
31 DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"`
32 DeviceVar set $DEV_VAR $DEV_VAL
33 ;;
34+ crossarch)
35+ CROSSARCH="$VAL"
36+ ;;
37 debug-and-release)
38 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
39 CFG_DEBUG_RELEASE="$VAL"
40@@ -3333,6 +3336,8 @@ arm*)
41 ;;
42 esac
43
44+CFG_ARCH="$CROSSARCH"
45+
46 if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
47 if [ "$OPT_VERBOSE" = "yes" ]; then
48 echo " '$CFG_ARCH' is supported"
49--
501.8.0
51