diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-05-28 11:49:29 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-03 16:45:05 +0100 |
| commit | 32a9c7101c7212c69d40893ee597eaf34955b641 (patch) | |
| tree | 1c4b8481fa993ec959f68dba8c73b614598e79c3 /meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch | |
| parent | d9c7a02240ce37d5b2569d9177e8ba534b9295ce (diff) | |
| download | openembedded-core-contrib-32a9c7101c7212c69d40893ee597eaf34955b641.tar.gz | |
qt4: upgrade to version 4.8.6
* Remove patches merged upstream
* Add a qtscript translation package for an additional .qm file added in
this release
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch new file mode 100644 index 0000000000..aa464fd1ed --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch @@ -0,0 +1,47 @@ +From 549342fa380ed2a9ad41be3d04ee2f0585f6a465 Mon Sep 17 00:00:00 2001 +From: Michael Lauer <mickey@vanille-media.de> +Date: Wed, 26 Sep 2012 20:41:32 +0200 +Subject: [PATCH 13/21] configure: add "-crossarch" option + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index 79c1c7b..7983c3d 100755 +--- a/configure ++++ b/configure +@@ -1153,7 +1153,7 @@ while [ "$#" -gt 0 ]; do + shift + VAL=$1 + ;; +- -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|-sysroot) ++ -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|-sysroot|-crossarch) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL="$1" +@@ -1709,6 +1709,9 @@ while [ "$#" -gt 0 ]; do + DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"` + DeviceVar set $DEV_VAR $DEV_VAL + ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; + debug-and-release) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DEBUG_RELEASE="$VAL" +@@ -3324,6 +3327,8 @@ arm*) + ;; + esac + ++CFG_ARCH="$CROSSARCH" ++ + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then + if [ "$OPT_VERBOSE" = "yes" ]; then + echo " '$CFG_ARCH' is supported" +-- +1.8.0 + |