2 files changed, 69 insertions, 1 deletions

diff --git a/meta/packages/icu/files/use-g++-for-linking.patch b/meta/packages/icu/files/use-g++-for-linking.patch
new file mode 100644
index 0000000000..4702abc065
--- /dev/null
+++ b/meta/packages/icu/files/use-g++-for-linking.patch
@@ -0,0 +1,67 @@
+---
+ tools/genccode/Makefile.in |    2 +-
+ tools/gencmn/Makefile.in   |    2 +-
+ tools/genrb/Makefile.in    |    2 +-
+ tools/pkgdata/Makefile.in  |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- source.orig/tools/genccode/Makefile.in
++++ source/tools/genccode/Makefile.in
+@@ -76,11 +76,11 @@ check-local: all-local
+ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+        cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+ $(TARGET) : $(OBJECTS)
+-       $(LINK.c) $(OUTOPT)$@ $^ $(LIBS)
++       $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+ 
+ 
+ %.$(SECTION): $(srcdir)/%.$(SECTION).in
+        cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+--- source.orig/tools/gencmn/Makefile.in
++++ source/tools/gencmn/Makefile.in
+@@ -76,11 +76,11 @@ check-local: all-local
+ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+        cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+ $(TARGET) : $(OBJECTS)
+-       $(LINK.c) $(OUTOPT)$@ $^ $(LIBS)
++       $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+ 
+ %.$(SECTION): $(srcdir)/%.$(SECTION).in
+        cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+--- source.orig/tools/genrb/Makefile.in
++++ source/tools/genrb/Makefile.in
+@@ -84,11 +84,11 @@ Makefile: $(srcdir)/Makefile.in  $(top_b
+ 
+ $(TARGET) : $(OBJECTS)
+        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) 
+ 
+ $(DERB) : $(DERB_OBJ)
+-       $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) 
++       $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+ 
+ 
+ # This line is needed to serialize builds when the gmake -j option is used.
+ $(TARGET_STUB_NAME).$(SECTION): $(DERB_STUB_NAME).$(SECTION)
+ 
+--- source.orig/tools/pkgdata/Makefile.in
++++ source/tools/pkgdata/Makefile.in
+@@ -81,11 +81,11 @@ check-local: all-local
+ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+        cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+ $(TARGET) : $(OBJECTS)
+-       $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) 
++       $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+ 
+ 
+ %.$(SECTION): $(srcdir)/%.$(SECTION).in
+        cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/meta/packages/icu/icu_3.6.bb b/meta/packages/icu/icu_3.6.bb
index 6d312a4496..91b25adbe9 100644
--- a/meta/packages/icu/icu_3.6.bb
+++ b/meta/packages/icu/icu_3.6.bb
@@ -1,8 +1,9 @@
 require icu-3.6.inc
 
 DEPENDS += "icu-native"
+PR = "r3"
 
-PR = "r2"
+SRC_URI += "file://use-g++-for-linking.patch;patch=1"
 
 do_configure_append() {
         for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do