diff options
author | Marko Lindqvist <cazfi74@gmail.com> | 2013-01-10 12:02:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-15 08:10:12 +0000 |
commit | be2c9d3a942220b6e4ad56af40607a26e0c85885 (patch) | |
tree | 0ad652ab761e46f55342c989e1bbcca2f280047c /meta/recipes-gnome | |
parent | 084f7067a0c384d2335bcaf158e2d25cb09bc699 (diff) | |
download | ast2050-yocto-poky-be2c9d3a942220b6e4ad56af40607a26e0c85885.zip ast2050-yocto-poky-be2c9d3a942220b6e4ad56af40607a26e0c85885.tar.gz |
gconf: 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: 388939c4cebabce8ef05c8aec5b9dccf390b75f0)
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>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r-- | meta/recipes-gnome/gnome/gconf-3.2.5/obsolete_automake_macros.patch | 14 | ||||
-rw-r--r-- | meta/recipes-gnome/gnome/gconf_3.2.5.bb | 6 |
2 files changed, 18 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gnome/gconf-3.2.5/obsolete_automake_macros.patch b/meta/recipes-gnome/gnome/gconf-3.2.5/obsolete_automake_macros.patch new file mode 100644 index 0000000..7dd4ee8 --- /dev/null +++ b/meta/recipes-gnome/gnome/gconf-3.2.5/obsolete_automake_macros.patch @@ -0,0 +1,14 @@ +Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691264] + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd GConf-3.2.5/configure.in GConf-3.2.5/configure.in +--- GConf-3.2.5/configure.in 2012-03-11 00:53:29.000000000 +0200 ++++ GConf-3.2.5/configure.in 2013-01-07 03:42:11.254087899 +0200 +@@ -39,7 +39,6 @@ + AC_PROG_CC + AC_PROG_CXX + AC_ISC_POSIX +-AM_PROG_CC_STDC + AC_HEADER_STDC + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL diff --git a/meta/recipes-gnome/gnome/gconf_3.2.5.bb b/meta/recipes-gnome/gnome/gconf_3.2.5.bb index 9e92322..c80c0b0 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.5.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.5.bb @@ -9,11 +9,13 @@ POLKIT_libc-uclibc = "" DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub" DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native" -PR = "r13" +PR = "r14" inherit gnomebase gtk-doc -SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive" +SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ + file://obsolete_automake_macros.patch \ +" S = "${WORKDIR}/GConf-${PV}" |