mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 03:32:13 +02:00
pkgconfig: Fix build with gcc-6
Our patch in master was on top of 0.29.1 update.
commit b83a808fcb
Apply to krogoth stable 0.29 version instead.
[YOCTO #9897] (Fedora-24)
(From OE-Core rev: 5b50a9948bbd4e5c1a56183defe4c150a85dcb15)
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
4f2716218f
commit
ba4d4372b1
@@ -0,0 +1,34 @@
|
||||
The upstream patch would not apply cleanly, so perform the same changes.
|
||||
|
||||
Original patch header:
|
||||
From 00148329967adb196138372771052a3f606a6ea3 Mon Sep 17 00:00:00 2001
|
||||
From: coypu <coypu@sdf.org>
|
||||
Date: Wed, 2 Mar 2016 19:43:10 +0200
|
||||
Subject: [PATCH 2/2] gdate: Suppress string format literal warning
|
||||
|
||||
Newer versions of GCC emit an error here, but we know it's safe.
|
||||
https://bugzilla.gnome.org/761550
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
|
||||
|
||||
Index: git/glib/glib/gdate.c
|
||||
===================================================================
|
||||
--- git.orig/glib/glib/gdate.c
|
||||
+++ git/glib/glib/gdate.c
|
||||
@@ -2439,6 +2439,8 @@ win32_strftime_helper (const GDate *
|
||||
*
|
||||
* 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 +2551,5 @@ g_date_strftime (gchar *s,
|
||||
return retval;
|
||||
#endif
|
||||
}
|
||||
+
|
||||
+#pragma GCC diagnostic pop
|
||||
@@ -18,6 +18,7 @@ PV = "0.29+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-suppress-string-format-literal-warning.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user