diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-30 11:52:59 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-30 11:52:59 +0100 |
| commit | 00145d9c9bd28839ecf75b34c0ab874bd36b03e3 (patch) | |
| tree | 36fd29e0bf2117ea9eecdc29233daa5be00e1224 | |
| parent | 7cecb5b9ca7fef3ffe4f6f6cc6659df70c479c29 (diff) | |
| download | openembedded-core-00145d9c9bd28839ecf75b34c0ab874bd36b03e3.tar.gz openembedded-core-00145d9c9bd28839ecf75b34c0ab874bd36b03e3.tar.bz2 openembedded-core-00145d9c9bd28839ecf75b34c0ab874bd36b03e3.tar.xz openembedded-core-00145d9c9bd28839ecf75b34c0ab874bd36b03e3.zip | |
icu: Add patch to fix issue with #elif and recent gcc versions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/packages/icu/files/gccfix.patch | 13 | ||||
| -rw-r--r-- | meta/packages/icu/icu-3.6.inc | 3 | ||||
| -rw-r--r-- | meta/packages/icu/icu-native_3.6.bb | 2 | ||||
| -rw-r--r-- | meta/packages/icu/icu_3.6.bb | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/meta/packages/icu/files/gccfix.patch b/meta/packages/icu/files/gccfix.patch new file mode 100644 index 000000000..9291e921d --- /dev/null +++ b/meta/packages/icu/files/gccfix.patch @@ -0,0 +1,13 @@ +Index: source/layoutex/ParagraphLayout.cpp +=================================================================== +--- source.orig/layoutex/ParagraphLayout.cpp 2009-06-30 11:48:47.000000000 +0100 ++++ source/layoutex/ParagraphLayout.cpp 2009-06-30 11:49:06.000000000 +0100 +@@ -798,7 +798,7 @@ + + return nullLanguageCode; + } +-#elif ++#else + + // TODO - dummy implementation for right now... + le_int32 ParagraphLayout::getLanguageCode(const Locale *locale) diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc index 1c7eda21e..be58fb1f4 100644 --- a/meta/packages/icu/icu-3.6.inc +++ b/meta/packages/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://gccfix.patch;patch=1" S = "${WORKDIR}/icu/source" diff --git a/meta/packages/icu/icu-native_3.6.bb b/meta/packages/icu/icu-native_3.6.bb index 887bfcac2..90dd0c937 100644 --- a/meta/packages/icu/icu-native_3.6.bb +++ b/meta/packages/icu/icu-native_3.6.bb @@ -1,3 +1,5 @@ require icu-3.6.inc inherit native + +PR = "r1" diff --git a/meta/packages/icu/icu_3.6.bb b/meta/packages/icu/icu_3.6.bb index 5b341470f..2df68f45e 100644 --- a/meta/packages/icu/icu_3.6.bb +++ b/meta/packages/icu/icu_3.6.bb @@ -1,7 +1,7 @@ require icu-3.6.inc DEPENDS += "icu-native" -PR = "r3" +PR = "r4" FULL_OPTIMIZATION_arm = "-Os" |