aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
index 726bfe00..2ad412e1 100644
--- a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
+++ b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
@@ -1,7 +1,7 @@
-From ebd38fc708cf7190e47a75754235f56fa5d86300 Mon Sep 17 00:00:00 2001
+From 96b69ad415b4883782841fa1d7723cf182e4ce6e Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 8 May 2013 23:54:35 +0200
-Subject: [PATCH 06/14] configure: don't export SYSTEM_VARIABLES to .qmake.vars
+Subject: [PATCH 06/17] configure: don't export SYSTEM_VARIABLES to .qmake.vars
* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
causing issues as we need g++ to be used as linker
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 14 deletions(-)
diff --git a/configure b/configure
-index 7f3f2f0..13dd619 100755
+index 43ad8df..341a01b 100755
--- a/configure
+++ b/configure
@@ -581,20 +581,6 @@ fi'`
@@ -39,5 +39,5 @@ index 7f3f2f0..13dd619 100755
mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
--
-1.8.5.3
+2.0.0