From da86b5aceeb2564d10f337e7c7fec01dafa4ad3f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 23 May 2010 23:29:38 +0200 Subject: icu: fix build with gcc >= 4.4 / JLEVEL > 1 Fix two issues with the icu build: - icu source contains an #elif without any arguments, which g++ >= 4.4 flags as an error. This is both an issue for target and host build, so restructure the .mk so any *both*patch is applied to both builds (the other patches would cause trouble with host builds) - icu build system isn't parallel make safe, use MAKE1 Signed-off-by: Peter Korsgaard --- package/icu/icu-both-elif-no-arguments.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 package/icu/icu-both-elif-no-arguments.patch (limited to 'package/icu/icu-both-elif-no-arguments.patch') diff --git a/package/icu/icu-both-elif-no-arguments.patch b/package/icu/icu-both-elif-no-arguments.patch new file mode 100644 index 000000000..8941c53b1 --- /dev/null +++ b/package/icu/icu-both-elif-no-arguments.patch @@ -0,0 +1,23 @@ +[PATCH] icu: fix #elif without arguments + +ParagraphLayout.cpp contains an #elif without any arguments, which +g++ >= 4.4 flags as an error. Fix it by replacing it with an #else. + +Signed-off-by: Peter Korsgaard +--- + source/layoutex/ParagraphLayout.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: source/layoutex/ParagraphLayout.cpp +=================================================================== +--- source.orig/layoutex/ParagraphLayout.cpp ++++ source/layoutex/ParagraphLayout.cpp +@@ -813,7 +813,7 @@ le_int32 ParagraphLayout::getLanguageCod + + return nullLanguageCode; + } +-#elif ++#else + + // TODO - dummy implementation for right now... + le_int32 ParagraphLayout::getLanguageCode(const Locale *locale) -- cgit v1.2.3