kumquat-buildroot/package/icu/icu-both-elif-no-arguments.patch
Peter Korsgaard da86b5acee 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 <jacmet@sunsite.dk>
2010-05-23 23:32:49 +02:00

24 lines
750 B
Diff

[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 <jacmet@sunsite.dk>
---
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)