diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch deleted file mode 100644 index 66724a8ecf..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | From 21af8f6d21b28a53041affb11b58d6316023fa92 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
| 3 | Date: Wed, 26 Sep 2012 20:45:10 +0200 | ||
| 4 | Subject: [PATCH 14/21] translations: fix phony translation linking error | ||
| 5 | |||
| 6 | | .../usr/lib/crt1.o: In function `_start': | ||
| 7 | | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' | ||
| 8 | | collect2: ld returned 1 exit status | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 13 | --- | ||
| 14 | translations/translations.pro | 4 ++-- | ||
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/translations/translations.pro b/translations/translations.pro | ||
| 18 | index dc99beb..0d98829 100644 | ||
| 19 | --- a/translations/translations.pro | ||
| 20 | +++ b/translations/translations.pro | ||
| 21 | @@ -101,7 +101,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} | ||
| 22 | updateqm.CONFIG += no_link | ||
| 23 | QMAKE_EXTRA_COMPILERS += updateqm | ||
| 24 | |||
| 25 | -isEmpty(vcproj) { | ||
| 26 | +!isEmpty(vcproj) { | ||
| 27 | QMAKE_LINK = @: IGNORE THIS LINE | ||
| 28 | OBJECTS_DIR = | ||
| 29 | win32:CONFIG -= embed_manifest_exe | ||
| 30 | @@ -111,7 +111,7 @@ isEmpty(vcproj) { | ||
| 31 | phony_src.input = PHONY_DEPS | ||
| 32 | phony_src.output = phony.c | ||
| 33 | phony_src.variable_out = GENERATED_SOURCES | ||
| 34 | - phony_src.commands = echo int main() { return 0; } > phony.c | ||
| 35 | + phony_src.commands = echo \"int main() { return 0; }\" > phony.c | ||
| 36 | phony_src.name = CREATE phony.c | ||
| 37 | phony_src.CONFIG += combine | ||
| 38 | QMAKE_EXTRA_COMPILERS += phony_src | ||
| 39 | -- | ||
| 40 | 1.8.0 | ||
| 41 | |||
