aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/icu
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2009-04-30 21:57:17 +0100
committerGraeme Gregory <dp@xora.org.uk>2009-04-30 21:59:05 +0100
commit0de958f8a3f363b79f7e3096663ff2ef37fe207f (patch)
treec495212ebf19432cce3a0b2217104063c50c9aea /recipes/icu
parentc7ca3bf3effbfde8a6fd415916122e6dd01acf2c (diff)
downloadopenembedded-0de958f8a3f363b79f7e3096663ff2ef37fe207f.tar.gz
openembedded-0de958f8a3f363b79f7e3096663ff2ef37fe207f.tar.bz2
openembedded-0de958f8a3f363b79f7e3096663ff2ef37fe207f.zip
icu/icu-3.6.inc : fix bad #elif that more modern compilers dont accept.
Diffstat (limited to 'recipes/icu')
-rw-r--r--recipes/icu/files/elif-to-else.patch13
-rw-r--r--recipes/icu/icu-3.6.inc3
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 0000000000..20e38ab400
--- /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 04fc8420ab..73162c2b80 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"