diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-12-05 22:59:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-11 15:54:37 +0000 |
commit | 89230eaa76edf2477af3f9bc31efe904d80ab71e (patch) | |
tree | e559c839558d0f9d7037979c65de64e49d2f75aa /meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch | |
parent | 348897358736c28240c084affaca5b4e2fbe499a (diff) | |
download | poky-89230eaa76edf2477af3f9bc31efe904d80ab71e.tar.gz |
qt4: upgrade to 4.8.4
* changes in licenses are only s/Nokia/Digia/
(From OE-Core rev: 5d898695ab3ce368a1d1f2066bb980ee829ae077)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch new file mode 100644 index 0000000000..1a8f2b7f94 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From ac93237bc90ea7773c0ef5275962baba01d4a9c7 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org> | ||
3 | Date: Wed, 26 Sep 2012 20:27:44 +0200 | ||
4 | Subject: [PATCH 05/21] configure: set LFLAGS to pick up zlib from staging | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | configure | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/configure b/configure | ||
14 | index cc04b27..5a7c4ee 100755 | ||
15 | --- a/configure | ||
16 | +++ b/configure | ||
17 | @@ -690,7 +690,7 @@ fi | ||
18 | # initalize variables | ||
19 | #------------------------------------------------------------------------------- | ||
20 | |||
21 | -SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | ||
22 | +SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS" | ||
23 | for varname in $SYSTEM_VARIABLES; do | ||
24 | qmakevarname="${varname}" | ||
25 | # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS | ||
26 | -- | ||
27 | 1.8.0 | ||
28 | |||