summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <timothy.t.orling@linux.intel.com>2016-07-14 18:49:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-27 08:33:37 +0100
commitba4d4372b197893c80c0d6c7deb565fad4d3ce06 (patch)
tree0102676b6bb42e6db73bac1b4e7fa3cfb75810bd
parent4f2716218f8c51ed0cfa001f4fa0d15cee83c412 (diff)
downloadpoky-ba4d4372b197893c80c0d6c7deb565fad4d3ce06.tar.gz
pkgconfig: Fix build with gcc-6
Our patch in master was on top of 0.29.1 update. commit b83a808fcbd3e7aec3b0757c7180cf83dac44e92 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>
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-suppress-string-format-literal-warning.patch34
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_git.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-suppress-string-format-literal-warning.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-suppress-string-format-literal-warning.patch
new file mode 100644
index 0000000000..830d3d2305
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-suppress-string-format-literal-warning.patch
@@ -0,0 +1,34 @@
1The upstream patch would not apply cleanly, so perform the same changes.
2
3Original patch header:
4From 00148329967adb196138372771052a3f606a6ea3 Mon Sep 17 00:00:00 2001
5From: coypu <coypu@sdf.org>
6Date: Wed, 2 Mar 2016 19:43:10 +0200
7Subject: [PATCH 2/2] gdate: Suppress string format literal warning
8
9Newer versions of GCC emit an error here, but we know it's safe.
10https://bugzilla.gnome.org/761550
11
12Upstream-Status: Backport
13
14Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
15
16Index: git/glib/glib/gdate.c
17===================================================================
18--- git.orig/glib/glib/gdate.c
19+++ git/glib/glib/gdate.c
20@@ -2439,6 +2439,8 @@ win32_strftime_helper (const GDate *
21 *
22 * Returns: number of characters written to the buffer, or 0 the buffer was too small
23 */
24+#pragma GCC diagnostic push
25+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
26 gsize
27 g_date_strftime (gchar *s,
28 gsize slen,
29@@ -2549,3 +2551,5 @@ g_date_strftime (gchar *s,
30 return retval;
31 #endif
32 }
33+
34+#pragma GCC diagnostic pop
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index d34f608f11..cd4dc8e7e8 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -18,6 +18,7 @@ PV = "0.29+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-suppress-string-format-literal-warning.patch \
21 " 22 "
22 23
23S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"