aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch13
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb3
2 files changed, 15 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch b/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch
new file mode 100644
index 00000000000..2fc4e75e785
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch
@@ -0,0 +1,13 @@
+Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691011]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd glib-2.34.3/configure.ac glib-2.34.3/configure.ac
+--- glib-2.34.3/configure.ac 2012-11-26 19:10:04.000000000 +0200
++++ glib-2.34.3/configure.ac 2013-01-02 15:49:27.832183712 +0200
+@@ -291,7 +291,6 @@
+ AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
+ AC_LANG_RESTORE
+
+-AM_PROG_CC_STDC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
index 9854585ca50..e1d44e2ee6d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r0"
+PR = "r1"
PE = "1"
DEPENDS += "libffi python-argparse-native zlib"
@@ -12,6 +12,7 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://configure-libtool.patch \
file://glib-2.0_fix_for_x32.patch \
+ file://obsolete_automake_macros.patch \
file://Makefile-ptest.patch \
file://run-ptest \
"