From 1f71583dacaf2abde4930815b3415c3af104f514 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 19 Nov 2012 14:22:34 +0000 Subject: qt4: remove 4.8.1 (From OE-Core rev: 5f6d7d61d79215ffe38aa6b122ae5ac0af7e859a) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...tions-fix-phony-translation-linking-error.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch') diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch deleted file mode 100644 index b788a68ece..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 306e0987cfdc67db11abc7071c48b0d196e84c8e Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Wed, 26 Sep 2012 20:45:10 +0200 -Subject: [PATCH 14/22] 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 ---- - 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 - -- cgit v1.2.3-54-g00ecf