diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-21 22:16:06 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-21 22:22:05 +0200 |
| commit | 35ccafd9c533c423aa7985ec2ce7f0512283c154 (patch) | |
| tree | d640ca4b1904df2a92e61bd7f3e2ef4a47ae2379 /recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | |
| parent | 81b7031859176f24c028c7234d795812bd1a3c95 (diff) | |
| download | meta-qt5-35ccafd9c533c423aa7985ec2ce7f0512283c154.tar.gz | |
qtbase: refresh patches, drop 2 unused
* drop Change-Ids, add Upstream-Status
* 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was
rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't
used in recipes
* 0004-Disable-mkv8snapshot.patch and
0005-AddSynchoronization-qimagereader.patch are special, because they
are applied only to 5.0.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/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/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch new file mode 100644 index 00000000..d1402124 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | From 62c2c404238e007021a80fcf62b51173be23a67e 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 8710c28..8b97cc2 100755 | ||
| 18 | --- a/configure | ||
| 19 | +++ b/configure | ||
| 20 | @@ -740,20 +740,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 | |||
