summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-07-20 15:13:32 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-07-25 12:14:12 +0200
commit507c7466ea3a7b10a72b57ce06c3bf1ddd769037 (patch)
treedfae928f81887550f603b11d0a36993b20d96394 /recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
parent902f55b957ba0407816739bfcae864c6bd2c3d68 (diff)
downloadmeta-qt5-507c7466ea3a7b10a72b57ce06c3bf1ddd769037.tar.gz
qt5: bump SRCREVs in git recipes to 5.1.0+
* patches will now be closer to 5.1.0 release Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
index 2c2360e6..6117e7fb 100644
--- a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
+++ b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
@@ -1,7 +1,7 @@
1From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 1From df07d747bdbb5652165a3c9395247729a4bf2fce Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 8 May 2013 23:54:35 +0200 3Date: Wed, 8 May 2013 23:54:35 +0200
4Subject: [PATCH 11/15] configure: don't export SYSTEM_VARIABLES to .qmake.vars 4Subject: [PATCH 11/23] configure: don't export SYSTEM_VARIABLES to .qmake.vars
5 5
6* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is 6* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
7 causing issues as we need g++ to be used as linker 7 causing issues as we need g++ to be used as linker
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 insertion(+), 14 deletions(-) 14 1 file changed, 1 insertion(+), 14 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index dbf99a9..9ca23a4 100755 17index 74f9e65..7a9a77c 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -840,20 +840,7 @@ fi'` 20@@ -849,20 +849,7 @@ fi'`
21 done 21 done
22 22
23 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" 23 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
@@ -40,5 +40,5 @@ index dbf99a9..9ca23a4 100755
40 mkdir -p "$outpath/config.tests" 40 mkdir -p "$outpath/config.tests"
41 rm -f "$outpath/config.tests/.qmake.cache" 41 rm -f "$outpath/config.tests/.qmake.cache"
42-- 42--
431.8.2.1 431.8.3.2
44 44