summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2016-05-11 10:35:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:41:29 +0100
commitb83a808fcbd3e7aec3b0757c7180cf83dac44e92 (patch)
treefe8b6fe4d264da3b347d30cd6b22ade82a9fd657 /meta
parent40abaa622b370b273fdd86e297ff767f60e62c63 (diff)
downloadpoky-b83a808fcbd3e7aec3b0757c7180cf83dac44e92.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 (From OE-Core rev: bad18b8f8954e2cf3f2edb4707f582db5905ccb2) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch39
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_git.bb1
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 @@
1From 946d36266d8a30f04fe34d3183bf4929141934d2 Mon Sep 17 00:00:00 2001
2From: coypu <coypu@sdf.org>
3Date: Wed, 2 Mar 2016 19:38:48 +0200
4Subject: [PATCH] gdate: Move warning pragma outside of function
5
6Commit 0817af40e8c74c721c30f6ef482b1f53d12044c7 breaks the build on
7older versions of GCC, which don't allow pragma inside functions.
8
9https://bugzilla.gnome.org/761550
10---
11Upstream-Status: Backport
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14 glib/glib/gdate.c | 5 +++++
15 1 file changed, 5 insertions(+)
16
17diff --git a/glib/glib/gdate.c b/glib/glib/gdate.c
18index 1978cf7..20e6c4a 100644
19--- a/glib/glib/gdate.c
20+++ b/glib/glib/gdate.c
21@@ -2439,6 +2439,9 @@ win32_strftime_helper (const GDate *d,
22 *
23 * Returns: number of characters written to the buffer, or 0 the buffer was too small
24 */
25+#pragma GCC diagnostic push
26+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
27+
28 gsize
29 g_date_strftime (gchar *s,
30 gsize slen,
31@@ -2549,3 +2552,5 @@ g_date_strftime (gchar *s,
32 return retval;
33 #endif
34 }
35+
36+#pragma GCC diagnostic pop
37--
381.9.1
39
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}"
18SRC_URI = "git://anongit.freedesktop.org/pkg-config \ 18SRC_URI = "git://anongit.freedesktop.org/pkg-config \
19 file://pkg-config-native.in \ 19 file://pkg-config-native.in \
20 file://fix-glib-configure-libtool-usage.patch \ 20 file://fix-glib-configure-libtool-usage.patch \
21 file://0001-gdate-Move-warning-pragma-outside-of-function.patch \
21 " 22 "
22 23
23S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"