glib-2.0: 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: fd05a7137082517947ba5af32d2b80a9beaa4ad7)

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>
This commit is contained in:
Marko Lindqvist 2013-01-08 09:16:36 +02:00 committed by Richard Purdie
parent 58c76a210c
commit 8e1ca4b956
2 changed files with 15 additions and 1 deletions

View File

@ -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

View File

@ -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 \
"