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:19:23 +0000 |
| commit | 5873734b21735f9fb598c7d8e67ce8cef9ddb39c (patch) | |
| tree | 9af28b99286771a0bb322157b78ddd2f9722f6e3 /meta/recipes-core/dbus/dbus-glib | |
| parent | 640b4274ee5653bb107a7ff043c33dc6392f9cfb (diff) | |
| download | openembedded-core-contrib-5873734b21735f9fb598c7d8e67ce8cef9ddb39c.tar.gz | |
dbus-glib: Upgrade to 0.102
Remove obsolete_automake_macros.patch, since upstream has merged it.
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
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 @@ +Disable compiling examples + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Kevin Tian <kevin.tian@intel.com> +Signed-off-by: Scott Garman <scott.a.garman@intel.com> + +--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 ++++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = . examples ++SUBDIRS = . + + INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" + 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 @@ +Change Makefile.am to install regression tests for test package purpose. + +Upstream-Status: Inappropriate [test not install is for purpose from upstream] + +Signed-off-by: Yao Zhao <yao.zhao@windriver.com> +Signed-off-by: Chong Lu <Chong.Lu@windriver.com> +--- + test/Makefile.am | 3 ++- + test/core/Makefile.am | 3 ++- + test/interfaces/Makefile.am | 3 ++- + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/test/Makefile.am b/test/Makefile.am +index 379c8c3..6580927 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -48,7 +48,8 @@ TESTS = \ + $(test_scripts) \ + $(NULL) + +-noinst_PROGRAMS = \ ++testdir = $(datadir)/@PACKAGE@/tests ++test_PROGRAMS = \ + $(test_programs) \ + $(test_related_programs) \ + $(NULL) +diff --git a/test/core/Makefile.am b/test/core/Makefile.am +index e4bceb4..54b077d 100644 +--- a/test/core/Makefile.am ++++ b/test/core/Makefile.am +@@ -64,7 +64,8 @@ endif + + ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we + ## build even when not doing "make check" +-noinst_PROGRAMS = \ ++testdir = $(datadir)/@PACKAGE@/tests/core ++test_PROGRAMS = \ + test-dbus-glib \ + test-error-mapping \ + test-service-glib \ +diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am +index a94d08d..707dcac 100644 +--- a/test/interfaces/Makefile.am ++++ b/test/interfaces/Makefile.am +@@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS + + ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we + ## build even when not doing "make check" +-noinst_PROGRAMS = test-service test-client ++testdir = $(datadir)/@PACKAGE@/tests/interfaces ++test_PROGRAMS = test-service test-client + + test_service_SOURCES = \ + test-interfaces.c \ +-- +1.9.1 + |