diff options
| author |   Dan McGregor <dan.mcgregor@usask.ca> | 2016-05-11 10:35:15 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-13 13:40:51 +0100 |
| commit | bad18b8f8954e2cf3f2edb4707f582db5905ccb2 (patch) | |
| tree | 4ef4f41c3f33938335df7028fe5458ae340b3b84 /meta/recipes-devtools/pkgconfig | |
| parent | e69feac4066c8c27b50c88daf9ebaa27a5c54646 (diff) | |
| download | openembedded-core-bad18b8f8954e2cf3f2edb4707f582db5905ccb2.tar.gz | |
pkgconfig: Fix build with gcc-6 and upgrade to 0.29.1
glib patch is backported from glib-2.0 upstream
eventually we will throw it away once pkgconfig
moves to newer glib
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pkgconfig')
| -rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch new file mode 100644 index 0000000000..14c8293a5e --- /dev/null +++ b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch @@ -0,0 +1,39 @@ +From 946d36266d8a30f04fe34d3183bf4929141934d2 Mon Sep 17 00:00:00 2001 +From: coypu <coypu@sdf.org> +Date: Wed, 2 Mar 2016 19:38:48 +0200 +Subject: [PATCH] gdate: Move warning pragma outside of function + +Commit 0817af40e8c74c721c30f6ef482b1f53d12044c7 breaks the build on +older versions of GCC, which don't allow pragma inside functions. + +https://bugzilla.gnome.org/761550 +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> + + glib/glib/gdate.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/glib/glib/gdate.c b/glib/glib/gdate.c +index 1978cf7..20e6c4a 100644 +--- a/glib/glib/gdate.c ++++ b/glib/glib/gdate.c +@@ -2439,6 +2439,9 @@ win32_strftime_helper (const GDate *d, + * + * Returns: number of characters written to the buffer, or 0 the buffer was too small + */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" ++ + gsize + g_date_strftime (gchar *s, + gsize slen, +@@ -2549,3 +2552,5 @@ g_date_strftime (gchar *s, + return retval; + #endif + } ++ ++#pragma GCC diagnostic pop +-- +1.9.1 + diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb index d7634e3b3d..86503b5fec 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb @@ -18,6 +18,7 @@ PV = "0.29.1+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/pkg-config \ file://pkg-config-native.in \ file://fix-glib-configure-libtool-usage.patch \ + file://0001-gdate-Move-warning-pragma-outside-of-function.patch \ " S = "${WORKDIR}/git" |