diff options
Diffstat (limited to 'meta/recipes-connectivity/avahi')
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb index 64e46a1ce4..3966b4c6e5 100644 --- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb @@ -64,5 +64,7 @@ do_install_append () { rm ${D}${mandir}/man1/a* rm ${D}${mandir}/man5 -rf rm ${D}${mandir}/man8 -rf + rm ${D}${libdir}/girepository-1.0/ -rf + rm ${D}${datadir}/gir-1.0/ -rf } diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 0c3c6430d6..81aad7935a 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -37,10 +37,9 @@ USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \ -c \"Avahi autoip daemon\" \ avahi-autoipd" -inherit autotools pkgconfig update-rc.d gettext useradd +inherit autotools pkgconfig update-rc.d gettext useradd gobject-introspection -EXTRA_OECONF = "--disable-introspection \ - --with-avahi-priv-access-group=adm \ +EXTRA_OECONF = "--with-avahi-priv-access-group=adm \ --disable-stack-protector \ --disable-gdbm \ --disable-mono \ @@ -66,8 +65,14 @@ LDFLAGS_append_uclinux-uclibc = " -lintl" do_configure_prepend() { sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac + + # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes + rm "${S}/common/introspection.m4" || true } +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs" +} PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" @@ -80,7 +85,7 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/udhcpc.d/00avahi-autoipd \ ${sysconfdir}/udhcpc.d/99avahi-autoipd" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core = "${libdir}/libavahi-core.so.*" +FILES_libavahi-core = "${libdir}/libavahi-core.so.* ${libdir}/girepository-1.0/AvahiCore*.typelib" FILES_avahi-daemon = "${sbindir}/avahi-daemon \ ${sysconfdir}/avahi/avahi-daemon.conf \ ${sysconfdir}/avahi/hosts \ @@ -97,7 +102,7 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ ${sysconfdir}/avahi/avahi-dnsconfd.action \ ${sysconfdir}/init.d/avahi-dnsconfd" FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" -FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" +FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.* ${libdir}/girepository-1.0/Avahi*.typelib" FILES_avahi-utils = "${bindir}/avahi-*" RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" |