[oe-commits] org.oe.dev merge of '9a8033e81f2f82d4e63c6bbb8247dec9e225a26b'

xora commit openembedded-commits at lists.openembedded.org
Tue Mar 4 15:47:33 UTC 2008 

merge of '9a8033e81f2f82d4e63c6bbb8247dec9e225a26b'
     and 'd1c77dbbaa65c8a85e23e784e8a31dc0878ab252'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 86d726bef49f50a286bf31283e1baf5324c04213
ViewMTN: http://monotone.openembedded.org/revision/info/86d726bef49f50a286bf31283e1baf5324c04213
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
packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch
packages/libgcrypt/libgcrypt_1.4.0.bb
packages/linux-libc-headers/linux-libc-headers.inc
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
packages/roadmap/roadmap.inc
Diffs:

#
# mt diff -r9a8033e81f2f82d4e63c6bbb8247dec9e225a26b -r86d726bef49f50a286bf31283e1baf5324c04213
#
# 
# 
# 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*
 }


#
# mt diff -rd1c77dbbaa65c8a85e23e784e8a31dc0878ab252 -r86d726bef49f50a286bf31283e1baf5324c04213
#
# 
# 
# patch "packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch"
#  from [5232a01eaab0ce7ff907ea44b68a6b042cc66cf5]
#    to [b1721a7c1917fbbedd8c8384cba1b945ca321d73]
# 
# patch "packages/libgcrypt/libgcrypt_1.4.0.bb"
#  from [aeb06341bebcef5a09a8d2768dda9c4965b14250]
#    to [6511cf175fcc175fa539dae0da56218ee04647d9]
# 
# patch "packages/linux-libc-headers/linux-libc-headers.inc"
#  from [8d23279cdfe7a7a9d3b20655625b2c6424e25069]
#    to [5c98632deeb64f09ea2d1409ebfb3f52ca329b18]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.23.bb"
#  from [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
#    to [9848fbf9a03e26527896520878c57d533bebc91e]
# 
# patch "packages/roadmap/roadmap.inc"
#  from [46055702ecd5e97c7f30231e54b7f3d929ea0fad]
#    to [9cc55a4e20979c8d8d54cf55678430dbc466d5cb]
# 
============================================================
--- packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch	5232a01eaab0ce7ff907ea44b68a6b042cc66cf5
+++ packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch	b1721a7c1917fbbedd8c8384cba1b945ca321d73
@@ -44,6 +44,6 @@ Index: libgcrypt-1.4.0/src/libgcrypt.pc.
 +Description: GNU crypto library
 +URL: http://www.gnupg.org
 +Version: @VERSION@
++Libs: -L${libdir} -lgcrypt
++Libs.private: -L${libdir} -lgpg-error
++Cflags: -I${includedir} 
-+Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@
-+Libs.private: @GPG_ERROR_LIBS@
-+Cflags: -I${includedir} @LIBGCRYPT_CONFIG_CFLAGS@ @GPG_ERROR_CFLAGS@
============================================================
--- packages/libgcrypt/libgcrypt_1.4.0.bb	aeb06341bebcef5a09a8d2768dda9c4965b14250
+++ packages/libgcrypt/libgcrypt_1.4.0.bb	6511cf175fcc175fa539dae0da56218ee04647d9
@@ -1,3 +1,3 @@ require libgcrypt.inc
 require libgcrypt.inc
 
+PR = "r3"
-PR = "r2"
============================================================
--- packages/linux-libc-headers/linux-libc-headers.inc	8d23279cdfe7a7a9d3b20655625b2c6424e25069
+++ packages/linux-libc-headers/linux-libc-headers.inc	5c98632deeb64f09ea2d1409ebfb3f52ca329b18
@@ -1,3 +1,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 SECTION = "devel"
 LICENSE = "GPL"
+
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.23.bb	66ed33603a1599bc68718e22c5e7fe1d81ff51cc
+++ packages/linux-libc-headers/linux-libc-headers_2.6.23.bb	9848fbf9a03e26527896520878c57d533bebc91e
@@ -1,8 +1,8 @@ DEPENDS += "unifdef-native"
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
============================================================
--- packages/roadmap/roadmap.inc	46055702ecd5e97c7f30231e54b7f3d929ea0fad
+++ packages/roadmap/roadmap.inc	9cc55a4e20979c8d8d54cf55678430dbc466d5cb
@@ -1,9 +1,7 @@ DESCRIPTION = "RoadMap is a program that
 DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." 
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin at iname.com>"
+AUTHOR = "Paul Fox <pgf at foxharp.boston.ma.us>"
 HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
 LICENSE = "GPL"
-RRECOMMENDS = "gpsd flite"
 DEPENDS = "expat"
 
 FILES_${PN} += "${datadir}/roadmap"
@@ -16,3 +14,6 @@ do_install() {
         oe_runmake install
         install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
 }
+
+RRECOMMENDS = "gpsd flite"
+FILES_${PN} += "${datadir}/roadmap"

More information about the Openembedded-commits mailing list