aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dbus
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:09:28 +0000
commit3f5e1d92a53015b44fa4eaf5325ba742a9a854e6 (patch)
treee2e7c973b831f71809a8436557d48b758fd7a82d /meta/recipes-core/dbus
parentdd1e33420cee433dc5c4bd302e44ccfc37eb6722 (diff)
downloadopenembedded-core-contrib-3f5e1d92a53015b44fa4eaf5325ba742a9a854e6.tar.gz
openembedded-core-contrib-3f5e1d92a53015b44fa4eaf5325ba742a9a854e6.tar.bz2
openembedded-core-contrib-3f5e1d92a53015b44fa4eaf5325ba742a9a854e6.zip
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. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/dbus')
-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 00000000000..40e3b12b5df
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59003]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd dbus-glib-0.100/configure.ac dbus-glib-0.100/configure.ac
+--- dbus-glib-0.100/configure.ac 2012-06-25 19:26:39.000000000 +0300
++++ dbus-glib-0.100/configure.ac 2013-01-03 04:53:22.314976758 +0200
+@@ -8,7 +8,7 @@
+
+ AM_INIT_AUTOMAKE([1.9])
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ # Honor aclocal flags
+ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index dff30c75647..01b90de5929 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"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
file://no-examples.patch \
file://test-install-makefile.patch \
+ file://obsolete_automake_macros.patch \
"
inherit 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 786cb994d23..ad5aa97d411 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 @@
require dbus-glib.inc
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "d33959a9c0c6a158f5ac6d640316e89e"
SRC_URI[sha256sum] = "80ddf7584a659590103817798dd95d7e451d666f385e5e95a83abf85c46d4605"