pkg-config: remove obsolete AM_PROG_CC_STDC

Add patch obsolete_automake_macros.patch that removes
AM_PROG_CC_STDC from included glib tree.

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>

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 (file)
index 0000000..7d93b1c
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch
@@ -0,0 +1,16 @@
+Remove obsolete AM_PROG_CC_STDC use as there's already modern equivalent,
+AC_PROG_CC, present.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd pkg-config-0.28/glib/configure.ac pkg-config-0.28/glib/configure.ac
+--- pkg-config-0.28/glib/configure.ac  2012-10-13 17:35:36.000000000 +0300
++++ pkg-config-0.28/glib/configure.ac  2013-05-24 23:48:34.093415116 +0300
+@@ -288,7 +288,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-devtools/pkgconfig/pkgconfig_0.28.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
index 99bb47f42d153cc4c01dd33e85112d7b90ec2853..6a17d7af8448436194ad296234633b170c68178f 100644 (file)
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
@@ -4,6 +4,7 @@ SRC_URI += " \
             file://glibconfig-sysdefs.h \
             file://pkg-config-native.in \
             file://fix-glib-configure-libtool-usage.patch \
+            file://obsolete_automake_macros.patch \
            "
 
 SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d"