diff options
| author | Matthias Hentges <oe@hentges.net> | 2008-01-04 14:10:51 +0000 |
|---|---|---|
| committer | Matthias Hentges <oe@hentges.net> | 2008-01-04 14:10:51 +0000 |
| commit | 6b3b57dfa59ae7b222455468b9618a74a65e6c96 (patch) | |
| tree | 8f65a1b197e6da15d2cefb45508b03136e73236b | |
| parent | ac5cd102a7b7a2a37c2c228aeb8f43ebd7d617ac (diff) | |
| parent | df936a73f8364e618f88d4675282188850835bfb (diff) | |
merge of '8015a13e63ef13c856f4a5a5f4e9b1fa3f143fa8'
and '85ea4469c6c02accbb588d6edee46fd9a00ad12d'
| -rw-r--r-- | packages/avahi/avahi.inc | 8 | ||||
| -rw-r--r-- | packages/gettext/gettext_0.14.1.bb | 16 |
2 files changed, 21 insertions, 3 deletions
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index e8e9e7c4a8..ae03d00e05 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPL" PR = "r5" -DEPENDS = "expat libdaemon dbus glib-2.0" +DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0" # uclibc has no nss RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns" @@ -22,10 +22,14 @@ inherit autotools pkgconfig update-rc.d RDEPENDS_append = "" # TODO: build and enable all the extra stuff avahi offers -EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}" +EXTRA_OECONF = "--with-distro=debian --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}" AVAHI_PYTHON = "--disable-python" AVAHI_GTK = "--disable-gtk" +LDFLAGS_append_linux-uclibc = " -lintl" +LDFLAGS_append_linux-uclibcgnueabi = " -lintl " +LDFLAGS_append_uclinux-uclibc = " -lintl" + PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb index 960db30b56..2184b8c863 100644 --- a/packages/gettext/gettext_0.14.1.bb +++ b/packages/gettext/gettext_0.14.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPL" -PR = "r6" +PR = "r7" PROVIDES = "virtual/libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ @@ -28,6 +28,20 @@ do_configure_prepend() { install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/ } +# these lack the .x behind the .so, but shouldn't be in the -dev package +# Otherwise you get the following results: +# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz +# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz +# because gettext depends on gettext-dev, which pulls in more -dev packages: +# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk +# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk +# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk +# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk + +PACKAGES =+ "libgettextlib libgettextsrc" +FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" +FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" + do_stage () { autotools_stage_includes oe_libinstall -so -C gettext-tools/lib libgettextlib ${STAGING_LIBDIR}/ |