diff options
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.patch | 44 |
1 files changed, 44 insertions, 0 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 new file mode 100644 index 00000000..fda64981 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 8 May 2013 23:54:35 +0200 | ||
4 | Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars | ||
5 | |||
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 | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | configure | 15 +-------------- | ||
14 | 1 file changed, 1 insertion(+), 14 deletions(-) | ||
15 | |||
16 | diff --git a/configure b/configure | ||
17 | index dbf99a9..9ca23a4 100755 | ||
18 | --- a/configure | ||
19 | +++ b/configure | ||
20 | @@ -840,20 +840,7 @@ fi'` | ||
21 | done | ||
22 | |||
23 | SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | ||
24 | -for varname in $SYSTEM_VARIABLES; do | ||
25 | - qmakevarname="${varname}" | ||
26 | - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS | ||
27 | - if [ "${varname}" = "LDFLAGS" ]; then | ||
28 | - qmakevarname="LFLAGS" | ||
29 | - elif [ "${varname}" = "LD" ]; then | ||
30 | - qmakevarname="LINK" | ||
31 | - fi | ||
32 | - cmd=`echo \ | ||
33 | -'if [ -n "\$'${varname}'" ]; then | ||
34 | - QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" | ||
35 | -fi'` | ||
36 | - eval "$cmd" | ||
37 | -done | ||
38 | + | ||
39 | # Use CC/CXX to run config.tests | ||
40 | mkdir -p "$outpath/config.tests" | ||
41 | rm -f "$outpath/config.tests/.qmake.cache" | ||
42 | -- | ||
43 | 1.8.2.1 | ||
44 | |||