diff options
author | Marko Lindqvist <cazfi74@gmail.com> | 2013-01-08 09:16:36 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-10 23:43:11 +0000 |
commit | 8e1ca4b9569b8341fc1494c51e1ba8060867bc26 (patch) | |
tree | a1c05570f3fd7988af392642e421d3d8f9cb1931 | |
parent | 58c76a210c6b9de462686fa41466a871bc716f00 (diff) | |
download | poky-8e1ca4b9569b8341fc1494c51e1ba8060867bc26.tar.gz |
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>
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch | 13 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb | 3 |
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 0000000000..2fc4e75e78 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691011] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd glib-2.34.3/configure.ac glib-2.34.3/configure.ac | ||
5 | --- glib-2.34.3/configure.ac 2012-11-26 19:10:04.000000000 +0200 | ||
6 | +++ glib-2.34.3/configure.ac 2013-01-02 15:49:27.832183712 +0200 | ||
7 | @@ -291,7 +291,6 @@ | ||
8 | AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) | ||
9 | AC_LANG_RESTORE | ||
10 | |||
11 | -AM_PROG_CC_STDC | ||
12 | AM_PROG_CC_C_O | ||
13 | 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 9854585ca5..e1d44e2ee6 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 @@ | |||
1 | require glib.inc | 1 | require glib.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | DEPENDS += "libffi python-argparse-native zlib" | 6 | DEPENDS += "libffi python-argparse-native zlib" |
@@ -12,6 +12,7 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1] | |||
12 | SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | 12 | SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ |
13 | file://configure-libtool.patch \ | 13 | file://configure-libtool.patch \ |
14 | file://glib-2.0_fix_for_x32.patch \ | 14 | file://glib-2.0_fix_for_x32.patch \ |
15 | file://obsolete_automake_macros.patch \ | ||
15 | file://Makefile-ptest.patch \ | 16 | file://Makefile-ptest.patch \ |
16 | file://run-ptest \ | 17 | file://run-ptest \ |
17 | " | 18 | " |