mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
40abaa622b
commit
b83a808fcb
+39
@@ -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
|
||||||
|
|
||||||
@@ -18,6 +18,7 @@ PV = "0.29.1+git${SRCPV}"
|
|||||||
SRC_URI = "git://anongit.freedesktop.org/pkg-config \
|
SRC_URI = "git://anongit.freedesktop.org/pkg-config \
|
||||||
file://pkg-config-native.in \
|
file://pkg-config-native.in \
|
||||||
file://fix-glib-configure-libtool-usage.patch \
|
file://fix-glib-configure-libtool-usage.patch \
|
||||||
|
file://0001-gdate-Move-warning-pragma-outside-of-function.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|||||||
Reference in New Issue
Block a user