diff options
author | Kai Kang <kai.kang@windriver.com> | 2015-06-02 09:52:57 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-08 17:30:50 +0100 |
commit | 4d033fdc5e754e22edb2e9074e30e58847c4b791 (patch) | |
tree | 85189088f467605738c715ae5b2dcdc78c729354 /meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch | |
parent | 3b1d89a51445cf526ca84eb5b53de434f9585d6e (diff) | |
download | openembedded-core-contrib-4d033fdc5e754e22edb2e9074e30e58847c4b791.tar.gz |
qt4: upgrade to 4.8.7
Upgrade qt4 packages from version 4.8.6 to 4.8.7.
* remove arm64 related patches which are merged
* remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch
which is backported.
* update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
and 0013-configure-add-crossarch-option.patch for new version
* remove useless variable INC_PR
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch deleted file mode 100644 index fbd32b173d..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 800abbba658203fc8e746e3fc780a297cd4110cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= - <perezmeyer@gmail.com> -Date: Wed, 20 Aug 2014 17:52:49 -0300 -Subject: [PATCH] Fix AArch64/arm64 detection. - -The detection needs to go before arm, else the system will detect AArch64/arm64 -as arm. - -This patch comes from Wookey, he has agreed to put it under BSD or Expat -to allow it's inclusion in here: -<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255> - -Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797 - - -Upstream-Status: Pending - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - configure | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure b/configure -index a9ba7c8..eb88b72 100755 ---- a/configure -+++ b/configure -@@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then - fi - CFG_HOST_ARCH=s390 - ;; -- *:*:arm*) -+ *:*:aarch64*|*:*:arm64*) - if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " ARM (arm)" -+ echo " AArch64 (aarch64)" - fi -- CFG_HOST_ARCH=arm -+ CFG_HOST_ARCH=aarch64 - ;; -- *:*:aarch64*) -+ *:*:arm*) - if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " AArch64 (aarch64)" -+ echo " ARM (arm)" - fi -- CFG_HOST_ARCH=aarch64 -+ CFG_HOST_ARCH=arm - ;; - Linux:*:sparc*) - if [ "$OPT_VERBOSE" = "yes" ]; then --- -2.1.0 |