diff options
author | Ross Burton <ross.burton@intel.com> | 2018-07-25 21:15:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 12:44:35 +0100 |
commit | 06a8d8d615f5b2b563865ded31c78bff66556d09 (patch) | |
tree | bee15f943bf771bd8823887459e5fe4f246e7a63 /meta | |
parent | 03282a8f5bf00fa7c15dce2f9b06ca5183c44b48 (diff) | |
download | poky-06a8d8d615f5b2b563865ded31c78bff66556d09.tar.gz |
dbus-glib: merge bb and inc
(From OE-Core rev: 29fc6fff32b05900526bf2426ba69a9a2d1f24f2)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/dbus/dbus-glib.inc | 37 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus-glib_0.110.bb | 37 |
2 files changed, 36 insertions, 38 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc deleted file mode 100644 index 16dbf4f08a..0000000000 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | SUMMARY = "High level language (GLib) binding for D-Bus" | ||
2 | DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \ | ||
3 | the D-Bus library with the GLib thread abstraction and main loop." | ||
4 | HOMEPAGE = "http://www.freedesktop.org/Software/dbus" | ||
5 | LICENSE = "AFL-2 | GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \ | ||
7 | file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c" | ||
8 | SECTION = "base" | ||
9 | |||
10 | DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" | ||
11 | DEPENDS_class-native = "glib-2.0-native dbus-native" | ||
12 | |||
13 | SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ | ||
14 | file://no-examples.patch \ | ||
15 | file://test-install-makefile.patch \ | ||
16 | " | ||
17 | |||
18 | inherit autotools pkgconfig gettext bash-completion gtk-doc | ||
19 | |||
20 | #default disable regression tests, some unit test code in non testing code | ||
21 | #PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf | ||
22 | PACKAGECONFIG ??= "" | ||
23 | PACKAGECONFIG[tests] = "--enable-tests,,," | ||
24 | |||
25 | EXTRA_OECONF_class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" | ||
26 | |||
27 | PACKAGES += "${PN}-tests" | ||
28 | |||
29 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" | ||
30 | FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" | ||
31 | FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" | ||
32 | FILES_${PN}-dev += "${bindir}/dbus-binding-tool" | ||
33 | |||
34 | RDEPENDS_${PN}-tests += "dbus-x11" | ||
35 | FILES_${PN}-tests = "${datadir}/${BPN}/tests" | ||
36 | |||
37 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/recipes-core/dbus/dbus-glib_0.110.bb b/meta/recipes-core/dbus/dbus-glib_0.110.bb index 8120505010..b7383bd2a6 100644 --- a/meta/recipes-core/dbus/dbus-glib_0.110.bb +++ b/meta/recipes-core/dbus/dbus-glib_0.110.bb | |||
@@ -1,4 +1,39 @@ | |||
1 | require dbus-glib.inc | 1 | SUMMARY = "High level language (GLib) binding for D-Bus" |
2 | DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \ | ||
3 | the D-Bus library with the GLib thread abstraction and main loop." | ||
4 | HOMEPAGE = "http://www.freedesktop.org/Software/dbus" | ||
5 | LICENSE = "AFL-2 | GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \ | ||
7 | file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c" | ||
8 | SECTION = "base" | ||
2 | 9 | ||
10 | DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" | ||
11 | DEPENDS_class-native = "glib-2.0-native dbus-native" | ||
12 | |||
13 | SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ | ||
14 | file://no-examples.patch \ | ||
15 | file://test-install-makefile.patch \ | ||
16 | " | ||
3 | SRC_URI[md5sum] = "d7cebf1d69445cbd28b4983392145192" | 17 | SRC_URI[md5sum] = "d7cebf1d69445cbd28b4983392145192" |
4 | SRC_URI[sha256sum] = "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" | 18 | SRC_URI[sha256sum] = "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" |
19 | |||
20 | inherit autotools pkgconfig gettext bash-completion gtk-doc | ||
21 | |||
22 | #default disable regression tests, some unit test code in non testing code | ||
23 | #PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf | ||
24 | PACKAGECONFIG ??= "" | ||
25 | PACKAGECONFIG[tests] = "--enable-tests,,," | ||
26 | |||
27 | EXTRA_OECONF_class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" | ||
28 | |||
29 | PACKAGES += "${PN}-tests" | ||
30 | |||
31 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" | ||
32 | FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" | ||
33 | FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" | ||
34 | FILES_${PN}-dev += "${bindir}/dbus-binding-tool" | ||
35 | |||
36 | RDEPENDS_${PN}-tests += "dbus-x11" | ||
37 | FILES_${PN}-tests = "${datadir}/${BPN}/tests" | ||
38 | |||
39 | BBCLASSEXTEND = "native" | ||