[oe-commits] org.oe.dev icu_3.6.bb : g++ linking fixes stolen from poky!

[xora commit]

icu_3.6.bb : g++ linking fixes stolen from poky!

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: d1c77dbbaa65c8a85e23e784e8a31dc0878ab252
ViewMTN: http://monotone.openembedded.org/revision/info/d1c77dbbaa65c8a85e23e784e8a31dc0878ab252
Files:
1
packages/icu/files
packages/icu/files/use-g++-for-linking.patch
packages/icu/icu-3.6.inc
packages/icu/icu_3.6.bb
Diffs:

#
# mt diff -rcf1e2bc5ee87871b3d33f7110d0d3803528b6d77 -rd1c77dbbaa65c8a85e23e784e8a31dc0878ab252
#
# 
# 
# add_dir "packages/icu/files"
# 
# add_file "packages/icu/files/use-g++-for-linking.patch"
#  content [f3fc6d4c8995e30a3bad19f492a52dd5dd4bf23c]
# 
# patch "packages/icu/icu-3.6.inc"
#  from [7932b55947e36c2c609908ef5686b177078bf8df]
#    to [fc2e090e04098e964f77d83388858ebe8eef78da]
# 
# patch "packages/icu/icu_3.6.bb"
#  from [5b44aed3810d59f100f97954c8497ac92521c5b7]
#    to [c125537df81011e56def168a326aa5184a69a756]
# 
============================================================
--- packages/icu/files/use-g++-for-linking.patch	f3fc6d4c8995e30a3bad19f492a52dd5dd4bf23c
+++ packages/icu/files/use-g++-for-linking.patch	f3fc6d4c8995e30a3bad19f492a52dd5dd4bf23c
@@ -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
============================================================
--- packages/icu/icu-3.6.inc	7932b55947e36c2c609908ef5686b177078bf8df
+++ packages/icu/icu-3.6.inc	fc2e090e04098e964f77d83388858ebe8eef78da
@@ -5,6 +5,8 @@ S = "${WORKDIR}/icu/source"
 
 S = "${WORKDIR}/icu/source"
 
+PARALLEL_MAKE = ""
+
 inherit autotools pkgconfig binconfig
 
 do_configure() {
============================================================
--- packages/icu/icu_3.6.bb	5b44aed3810d59f100f97954c8497ac92521c5b7
+++ packages/icu/icu_3.6.bb	c125537df81011e56def168a326aa5184a69a756
@@ -1,8 +1,9 @@ DEPENDS += "icu-native"
 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
@@ -13,6 +14,10 @@ do_configure_append() {
 	sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true
 }
 
+do_compile() {
+	oe_runmake 'CXX=${CXX}'
+}
+
 do_install_append() {
         chmod +x ${D}${libdir}/lib*
 }