summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-05-24 22:25:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-30 20:59:08 +0100
commite9648158c3e6ea5e7fe64c2f205a399473e4e2f9 (patch)
tree5fdc928cd1d8da62e61daea3c4a322fadad780db
parenta09c5e4b0b47018d6359a337bb30d5bc9c45ddf0 (diff)
downloadpoky-e9648158c3e6ea5e7fe64c2f205a399473e4e2f9.tar.gz
pkg-config: remove obsolete AM_PROG_CC_STDC
Add patch obsolete_automake_macros.patch that removes AM_PROG_CC_STDC from included glib tree. (From OE-Core rev: 5e06a20403c59f80e0ffa90626a2bab832af7a46) 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-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch16
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb1
2 files changed, 17 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..7d93b1c05a
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch
@@ -0,0 +1,16 @@
1Remove obsolete AM_PROG_CC_STDC use as there's already modern equivalent,
2AC_PROG_CC, present.
3
4Upstream-Status: Submitted
5
6Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
7diff -Nurd pkg-config-0.28/glib/configure.ac pkg-config-0.28/glib/configure.ac
8--- pkg-config-0.28/glib/configure.ac 2012-10-13 17:35:36.000000000 +0300
9+++ pkg-config-0.28/glib/configure.ac 2013-05-24 23:48:34.093415116 +0300
10@@ -288,7 +288,6 @@
11 AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
12 AC_LANG_RESTORE
13
14-AM_PROG_CC_STDC
15 AM_PROG_CC_C_O
16 AC_PROG_INSTALL
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
index 99bb47f42d..6a17d7af84 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
@@ -4,6 +4,7 @@ SRC_URI += " \
4 file://glibconfig-sysdefs.h \ 4 file://glibconfig-sysdefs.h \
5 file://pkg-config-native.in \ 5 file://pkg-config-native.in \
6 file://fix-glib-configure-libtool-usage.patch \ 6 file://fix-glib-configure-libtool-usage.patch \
7 file://obsolete_automake_macros.patch \
7 " 8 "
8 9
9SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d" 10SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d"