summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-10 11:57:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-15 08:10:10 +0000
commit7b8703886718ef2f63ea355b017dcdf69fb5e56e (patch)
tree2d0a896262075235dc3b1b1b1a411cf88a8ca741
parentde8ec21593877bfa48a17e3ec3b2b651067554c1 (diff)
downloadpoky-7b8703886718ef2f63ea355b017dcdf69fb5e56e.tar.gz
dbus-glib: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. (From OE-Core rev: 3f5e1d92a53015b44fa4eaf5325ba742a9a854e6) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-core/dbus/dbus-glib.inc1
-rw-r--r--meta/recipes-core/dbus/dbus-glib_0.100.bb2
3 files changed, 17 insertions, 1 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch b/meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..40e3b12b5d
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59003]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd dbus-glib-0.100/configure.ac dbus-glib-0.100/configure.ac
5--- dbus-glib-0.100/configure.ac 2012-06-25 19:26:39.000000000 +0300
6+++ dbus-glib-0.100/configure.ac 2013-01-03 04:53:22.314976758 +0200
7@@ -8,7 +8,7 @@
8
9 AM_INIT_AUTOMAKE([1.9])
10
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 # Honor aclocal flags
15 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index dff30c7564..01b90de592 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -13,6 +13,7 @@ DEPENDS_class-native = "glib-2.0-native dbus-native"
13SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ 13SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
14 file://no-examples.patch \ 14 file://no-examples.patch \
15 file://test-install-makefile.patch \ 15 file://test-install-makefile.patch \
16 file://obsolete_automake_macros.patch \
16" 17"
17 18
18inherit autotools pkgconfig gettext 19inherit autotools pkgconfig gettext
diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.bb b/meta/recipes-core/dbus/dbus-glib_0.100.bb
index 786cb994d2..ad5aa97d41 100644
--- a/meta/recipes-core/dbus/dbus-glib_0.100.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.100.bb
@@ -1,6 +1,6 @@
1require dbus-glib.inc 1require dbus-glib.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI[md5sum] = "d33959a9c0c6a158f5ac6d640316e89e" 5SRC_URI[md5sum] = "d33959a9c0c6a158f5ac6d640316e89e"
6SRC_URI[sha256sum] = "80ddf7584a659590103817798dd95d7e451d666f385e5e95a83abf85c46d4605" 6SRC_URI[sha256sum] = "80ddf7584a659590103817798dd95d7e451d666f385e5e95a83abf85c46d4605"