diff options
author | Chong Lu <Chong.Lu@windriver.com> | 2014-11-24 14:07:48 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-03 12:23:57 +0000 |
commit | 1654f385da498678d50e6c353417c7e14fe6afc7 (patch) | |
tree | a78825c17d12947f7d5ea4413e7a9758012498a3 /meta/recipes-core/dbus/dbus-glib | |
parent | 89a8e1c4e16d3b158502581e37968571813d1297 (diff) | |
download | poky-1654f385da498678d50e6c353417c7e14fe6afc7.tar.gz |
dbus-glib: Upgrade to 0.102
Remove obsolete_automake_macros.patch, since upstream has merged it.
(From OE-Core rev: 5873734b21735f9fb598c7d8e67ce8cef9ddb39c)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus/dbus-glib')
-rw-r--r-- | meta/recipes-core/dbus/dbus-glib/no-examples.patch | 15 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch | 57 |
2 files changed, 72 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib/no-examples.patch b/meta/recipes-core/dbus/dbus-glib/no-examples.patch new file mode 100644 index 0000000000..fbb4967828 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Disable compiling examples | ||
2 | |||
3 | Upstream-Status: Inappropriate [disable feature] | ||
4 | |||
5 | Signed-off-by: Kevin Tian <kevin.tian@intel.com> | ||
6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
7 | |||
8 | --- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 | ||
9 | +++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 | ||
10 | @@ -1,4 +1,4 @@ | ||
11 | -SUBDIRS = . examples | ||
12 | +SUBDIRS = . | ||
13 | |||
14 | INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" | ||
15 | |||
diff --git a/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch new file mode 100644 index 0000000000..027c82b27e --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | Change Makefile.am to install regression tests for test package purpose. | ||
2 | |||
3 | Upstream-Status: Inappropriate [test not install is for purpose from upstream] | ||
4 | |||
5 | Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | ||
6 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
7 | --- | ||
8 | test/Makefile.am | 3 ++- | ||
9 | test/core/Makefile.am | 3 ++- | ||
10 | test/interfaces/Makefile.am | 3 ++- | ||
11 | 3 files changed, 6 insertions(+), 3 deletions(-) | ||
12 | |||
13 | diff --git a/test/Makefile.am b/test/Makefile.am | ||
14 | index 379c8c3..6580927 100644 | ||
15 | --- a/test/Makefile.am | ||
16 | +++ b/test/Makefile.am | ||
17 | @@ -48,7 +48,8 @@ TESTS = \ | ||
18 | $(test_scripts) \ | ||
19 | $(NULL) | ||
20 | |||
21 | -noinst_PROGRAMS = \ | ||
22 | +testdir = $(datadir)/@PACKAGE@/tests | ||
23 | +test_PROGRAMS = \ | ||
24 | $(test_programs) \ | ||
25 | $(test_related_programs) \ | ||
26 | $(NULL) | ||
27 | diff --git a/test/core/Makefile.am b/test/core/Makefile.am | ||
28 | index e4bceb4..54b077d 100644 | ||
29 | --- a/test/core/Makefile.am | ||
30 | +++ b/test/core/Makefile.am | ||
31 | @@ -64,7 +64,8 @@ endif | ||
32 | |||
33 | ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we | ||
34 | ## build even when not doing "make check" | ||
35 | -noinst_PROGRAMS = \ | ||
36 | +testdir = $(datadir)/@PACKAGE@/tests/core | ||
37 | +test_PROGRAMS = \ | ||
38 | test-dbus-glib \ | ||
39 | test-error-mapping \ | ||
40 | test-service-glib \ | ||
41 | diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am | ||
42 | index a94d08d..707dcac 100644 | ||
43 | --- a/test/interfaces/Makefile.am | ||
44 | +++ b/test/interfaces/Makefile.am | ||
45 | @@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS | ||
46 | |||
47 | ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we | ||
48 | ## build even when not doing "make check" | ||
49 | -noinst_PROGRAMS = test-service test-client | ||
50 | +testdir = $(datadir)/@PACKAGE@/tests/interfaces | ||
51 | +test_PROGRAMS = test-service test-client | ||
52 | |||
53 | test_service_SOURCES = \ | ||
54 | test-interfaces.c \ | ||
55 | -- | ||
56 | 1.9.1 | ||
57 | |||