summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-07-25 21:54:57 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-01 11:47:10 +0100
commitb332b38ccfbd1ccc5b997cc85fe64121398919ee (patch)
treebc01b33bb69fc9aca430aa236990d854b455bdb9 /meta/recipes-connectivity
parentbaaaea5145af375a7630751f024ef5cb82ae7a2b (diff)
downloadpoky-b332b38ccfbd1ccc5b997cc85fe64121398919ee.tar.gz
avahi-ui: use PACKAGECONFIG for gtk features
The commit "054ea20 avahi-ui: Build with Gtk+3" enabled gtk3 and disabled gtk2, which causes failure on some package depends on gtk2, like gnome-disk-utility in meta-openembedded/meta-gnome: | checking for GTK2... yes | checking for AVAHI_UI... no | configure: error: Package requirements (avahi-ui >= 0.6.25) were not met: | | No package 'avahi-ui' found The gtk2 and gtk3 feature for avahi-ui is not exclusive, so change to use PACKAGECONFIG for them so we can easily enable/disable one of them or both of them as needed. (From OE-Core rev: bb44ef79c1ea9fb1d2e37978bcf964e62caaf4cd) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb4
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc10
2 files changed, 9 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 c6f67f1eca..ac364618e4 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
@@ -13,9 +13,9 @@ SRC_URI += "file://0001-configure.ac-install-GtkBuilder-interface-files-for-.pat
13SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" 13SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
14SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454" 14SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
15 15
16DEPENDS += "avahi gtk+3" 16DEPENDS += "avahi"
17 17
18AVAHI_GTK = "--disable-gtk --enable-gtk3 --disable-pygtk" 18AVAHI_GTK = "gtk3"
19 19
20S = "${WORKDIR}/avahi-${PV}" 20S = "${WORKDIR}/avahi-${PV}"
21 21
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 340b3e601f..234646d291 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -23,8 +23,14 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}
23 " 23 "
24UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" 24UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
25 25
26PACKAGECONFIG ??= "dbus" 26# For gtk related PACKAGECONFIGs: gtk, gtk3 and pygtk
27AVAHI_GTK ?= ""
28
29PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
27PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" 30PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
31PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
32PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
33PACKAGECONFIG[pygtk] = "--enable-pygtk,--disable-pygtk,"
28 34
29USERADD_PACKAGES = "avahi-daemon avahi-autoipd" 35USERADD_PACKAGES = "avahi-daemon avahi-autoipd"
30USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ 36USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
@@ -51,14 +57,12 @@ EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
51 --disable-manpages \ 57 --disable-manpages \
52 ${EXTRA_OECONF_SYSVINIT} \ 58 ${EXTRA_OECONF_SYSVINIT} \
53 ${EXTRA_OECONF_SYSTEMD} \ 59 ${EXTRA_OECONF_SYSTEMD} \
54 ${AVAHI_GTK} \
55 " 60 "
56 61
57# The distro choice determines what init scripts are installed 62# The distro choice determines what init scripts are installed
58EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}" 63EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
59EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" 64EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
60 65
61AVAHI_GTK ?= "--disable-gtk --disable-gtk3"
62 66
63LDFLAGS_append_libc-uclibc = " -lintl" 67LDFLAGS_append_libc-uclibc = " -lintl"
64LDFLAGS_append_uclinux-uclibc = " -lintl" 68LDFLAGS_append_uclinux-uclibc = " -lintl"