diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 21:18:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:28 +0100 |
commit | 42b3fc6dd3c8a1c608306aa85ca5e5a77d94ee1d (patch) | |
tree | d04aaf16c9e9492586937186d48eb9f0dfa2631e /meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch | |
parent | 89386fde895a585c6322fc94b594c35a355555e7 (diff) | |
download | ast2050-yocto-poky-42b3fc6dd3c8a1c608306aa85ca5e5a77d94ee1d.zip ast2050-yocto-poky-42b3fc6dd3c8a1c608306aa85ca5e5a77d94ee1d.tar.gz |
qt4: add 4.8.3 version with negative D_P
* rebased patches, 3 patches are resolved upstream:
0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b
0022-webkit-fix-conflicting-types.patch
resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1
(From OE-Core rev: b9fc4928bb93ad720c47920db3869d860c531d0a)
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.3/0014-translations-fix-phony-translation-linking-error.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch new file mode 100644 index 0000000..0874c84 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch @@ -0,0 +1,41 @@ +From 851eb73f7c2d3fa8dc017c3fb4f448b522cd9873 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador <otavio@ossystems.com.br> +Date: Wed, 26 Sep 2012 20:45:10 +0200 +Subject: [PATCH 14/20] translations: fix phony translation linking error + + | .../usr/lib/crt1.o: In function `_start': + | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' + | collect2: ld returned 1 exit status + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + translations/translations.pro | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/translations/translations.pro b/translations/translations.pro +index dc99beb..0d98829 100644 +--- a/translations/translations.pro ++++ b/translations/translations.pro +@@ -101,7 +101,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} + updateqm.CONFIG += no_link + QMAKE_EXTRA_COMPILERS += updateqm + +-isEmpty(vcproj) { ++!isEmpty(vcproj) { + QMAKE_LINK = @: IGNORE THIS LINE + OBJECTS_DIR = + win32:CONFIG -= embed_manifest_exe +@@ -111,7 +111,7 @@ isEmpty(vcproj) { + phony_src.input = PHONY_DEPS + phony_src.output = phony.c + phony_src.variable_out = GENERATED_SOURCES +- phony_src.commands = echo int main() { return 0; } > phony.c ++ phony_src.commands = echo \"int main() { return 0; }\" > phony.c + phony_src.name = CREATE phony.c + phony_src.CONFIG += combine + QMAKE_EXTRA_COMPILERS += phony_src +-- +1.7.12 + |