diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 21:00:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:28 +0100 |
commit | aea363afaa193feee774dad30d81c516ea4a98fc (patch) | |
tree | 00b6ca102fe4b7c09da87d482ec04a90d128e03c /meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch | |
parent | 425df23c02b7dad3c843ec9959a51337ab450cd1 (diff) | |
download | poky-aea363afaa193feee774dad30d81c516ea4a98fc.tar.gz |
qt4: replace all local patches with git patches with headers
* in preparation for upgrade to 4.8.3
(From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/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.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch new file mode 100644 index 0000000000..9171fa76dd --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 1602cdf7f3bb548e63fca40b5bff8b9a75a144c5 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/22] 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 00b072a..b1ba542 100755 | ||
15 | --- a/configure | ||
16 | +++ b/configure | ||
17 | @@ -611,7 +611,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.7.12 | ||
28 | |||