diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-05 11:09:43 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-13 12:15:24 +0000 |
| commit | 5c834057cbb1a51d97a3779a5d7835f462c98567 (patch) | |
| tree | 264758f632c12991998ee28d006409fa176e6650 | |
| parent | 170604d54c297ab6c02deb957176d487dad06afe (diff) | |
| download | openembedded-core-5c834057cbb1a51d97a3779a5d7835f462c98567.tar.gz openembedded-core-5c834057cbb1a51d97a3779a5d7835f462c98567.tar.bz2 openembedded-core-5c834057cbb1a51d97a3779a5d7835f462c98567.tar.xz openembedded-core-5c834057cbb1a51d97a3779a5d7835f462c98567.zip | |
icu: Convert to BBCLASSEXTEND
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/packages/icu/icu-3.6.inc | 39 | ||||
| -rw-r--r-- | meta/packages/icu/icu-native_3.6.bb | 5 | ||||
| -rw-r--r-- | meta/packages/icu/icu_3.6.bb | 28 |
3 files changed, 33 insertions, 39 deletions
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc index be58fb1f4..90b4729bf 100644 --- a/meta/packages/icu/icu-3.6.inc +++ b/meta/packages/icu/icu-3.6.inc @@ -1,12 +1,15 @@ -LICENSE = "ICU" - SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \ - file://gccfix.patch;patch=1" + file://gccfix.patch;patch=1 \ + file://use-g++-for-linking.patch;patch=1" +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_virtclass-native = "" S = "${WORKDIR}/icu/source" PARALLEL_MAKE = "" +FULL_OPTIMIZATION_arm = "-Os" inherit autotools_stage pkgconfig binconfig @@ -14,6 +17,30 @@ do_configure() { libtoolize --force gnu-configize --force oe_runconf -} - - + for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do + sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i + sed -i -e 's:$(BINDIR)/::g' $i + done + sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc || true + 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* +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicule = "${libdir}/libicule.so.*" +FILES_libiculx = "${libdir}/libiculx.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/icu/icu-native_3.6.bb b/meta/packages/icu/icu-native_3.6.bb deleted file mode 100644 index 90dd0c937..000000000 --- a/meta/packages/icu/icu-native_3.6.bb +++ /dev/null @@ -1,5 +0,0 @@ -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 2df68f45e..7490dbd6c 100644 --- a/meta/packages/icu/icu_3.6.bb +++ b/meta/packages/icu/icu_3.6.bb @@ -1,37 +1,9 @@ require icu-3.6.inc -DEPENDS += "icu-native" PR = "r4" -FULL_OPTIMIZATION_arm = "-Os" -SRC_URI += "file://use-g++-for-linking.patch;patch=1" -do_configure_append() { - for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do - sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i - sed -i -e 's:$(BINDIR)/::g' $i - done - sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc || true - 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* -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicule = "${libdir}/libicule.so.*" -FILES_libiculx = "${libdir}/libiculx.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" |