[oe-commits] Graeme Gregory : icu/icu-3.6.inc : fix bad #elif that more modern compilers dont accept.

GIT User account git at amethyst.openembedded.net
Thu Apr 30 21:04:48 UTC 2009


Module: openembedded.git
Branch: xora/angstrom-srcpv
Commit: 0de958f8a3f363b79f7e3096663ff2ef37fe207f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0de958f8a3f363b79f7e3096663ff2ef37fe207f

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Thu Apr 30 21:57:17 2009 +0100

icu/icu-3.6.inc : fix bad #elif that more modern compilers dont accept.

---

 recipes/icu/files/elif-to-else.patch |   13 +++++++++++++
 recipes/icu/icu-3.6.inc              |    3 ++-
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/recipes/icu/files/elif-to-else.patch b/recipes/icu/files/elif-to-else.patch
new file mode 100644
index 0000000..20e38ab
--- /dev/null
+++ b/recipes/icu/files/elif-to-else.patch
@@ -0,0 +1,13 @@
+Index: source/layoutex/ParagraphLayout.cpp
+===================================================================
+--- source.orig/layoutex/ParagraphLayout.cpp
++++ source/layoutex/ParagraphLayout.cpp
+@@ -798,7 +798,7 @@ le_int32 ParagraphLayout::getLanguageCod
+ 
+     return nullLanguageCode;
+ }
+-#elif
++#else
+ 
+ // TODO - dummy implementation for right now...
+ le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
diff --git a/recipes/icu/icu-3.6.inc b/recipes/icu/icu-3.6.inc
index 04fc842..73162c2 100644
--- a/recipes/icu/icu-3.6.inc
+++ b/recipes/icu/icu-3.6.inc
@@ -1,7 +1,8 @@
 
 LICENSE = "ICU"
 
-SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz"
+SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
+           file://elif-to-else.patch;patch=1"
 
 S = "${WORKDIR}/icu/source"
 





More information about the Openembedded-commits mailing list