diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-07-14 18:49:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-27 08:33:38 +0100 |
commit | b3acdca9b67ce6bbe5fc07f409aee6f6915060bb (patch) | |
tree | e9332058566d6ea10bbf02d635cd5116a73b9896 /meta/recipes-core/glib-2.0/glib-2.0 | |
parent | 7204ed57eda52f2e765191d488b6e1a7b7c65b15 (diff) | |
download | poky-b3acdca9b67ce6bbe5fc07f409aee6f6915060bb.tar.gz |
glib-2.0: Ignore useless warning found with gcc-6
../../glib-2.46.2/glib/gdate.c:2497:7: error: format not a string literal, format string not checked [-Werror=format-nonliteral]
tmplen = strftime (tmpbuf, tmpbufsize, locale_format, &tm);
^~~~~~
| ../../../../../../../../workspace/sources/glib-2.0/glib/tests/gdatetime.c: In function 'test_strftime':
| ../../../../../../../../workspace/sources/glib-2.0/glib/tests/gdatetime.c:1338:3: error: '%c' yields only last 2 digits of year in some locales [-Werror=format-y2k]
| "a%a A%A b%b B%B c%c C%C d%d e%e F%F g%g G%G h%h H%H I%I j%j m%m M%M " \
Additionally fix the problem seen where write() return code is ignored
(From OE-Core rev: 3fdecff96dd7516605ec9248b2a39de4db81306f)
(From OE-Core rev: 76271b5710e8d02d4ca0559cbf72c149f9beb4e2)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
3 files changed, 123 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch new file mode 100644 index 0000000000..aee96aaa6e --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From d6501b107940e9f548c89236d773c6d33c15a5c9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 16 Apr 2016 13:28:59 -0700 | ||
4 | Subject: [PATCH 1/2] Do not ignore return value of write() | ||
5 | |||
6 | gcc warns about ignoring return value when compiling | ||
7 | with fortify turned on. | ||
8 | |||
9 | assert when write() fails | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Submitted | ||
14 | |||
15 | glib/tests/unix.c | 5 +++-- | ||
16 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/glib/tests/unix.c b/glib/tests/unix.c | ||
19 | index 3543458..4e7ed85 100644 | ||
20 | --- a/glib/tests/unix.c | ||
21 | +++ b/glib/tests/unix.c | ||
22 | @@ -32,14 +32,15 @@ test_pipe (void) | ||
23 | GError *error = NULL; | ||
24 | int pipefd[2]; | ||
25 | char buf[1024]; | ||
26 | - ssize_t bytes_read; | ||
27 | + ssize_t bytes_read, bytes_written; | ||
28 | gboolean res; | ||
29 | |||
30 | res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); | ||
31 | g_assert (res); | ||
32 | g_assert_no_error (error); | ||
33 | |||
34 | - write (pipefd[1], "hello", sizeof ("hello")); | ||
35 | + bytes_written = write (pipefd[1], "hello", sizeof ("hello")); | ||
36 | + g_assert (bytes_written != -1 && "write() failed"); | ||
37 | memset (buf, 0, sizeof (buf)); | ||
38 | bytes_read = read (pipefd[0], buf, sizeof(buf) - 1); | ||
39 | g_assert_cmpint (bytes_read, >, 0); | ||
40 | -- | ||
41 | 2.8.0 | ||
42 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch b/meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch new file mode 100644 index 0000000000..f61fa0ae6a --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From b06b22fecc7deda8c65e28670562ca2371e4e725 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 16 Apr 2016 13:43:54 -0700 | ||
4 | Subject: [PATCH 2/2] tests: Ignore y2k warnings | ||
5 | |||
6 | silences | ||
7 | | ../../../../../../../../workspace/sources/glib-2.0/glib/tests/gdatetime.c: In function 'test_strftime': | ||
8 | | ../../../../../../../../workspace/sources/glib-2.0/glib/tests/gdatetime.c:1338:3: error: '%c' yields only last 2 digits of year in some locales [-Werror=format-y2k] | ||
9 | | "a%a A%A b%b B%B c%c C%C d%d e%e F%F g%g G%G h%h H%H I%I j%j m%m M%M " | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Submitted | ||
14 | |||
15 | glib/tests/gdatetime.c | 4 ++++ | ||
16 | 1 file changed, 4 insertions(+) | ||
17 | |||
18 | diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c | ||
19 | index 16a163c..e6062fc 100644 | ||
20 | --- a/glib/tests/gdatetime.c | ||
21 | +++ b/glib/tests/gdatetime.c | ||
22 | @@ -1326,6 +1326,9 @@ test_z (void) | ||
23 | g_time_zone_unref (tz); | ||
24 | } | ||
25 | |||
26 | +#pragma GCC diagnostic push | ||
27 | +#pragma GCC diagnostic ignored "-Wformat-y2k" | ||
28 | + | ||
29 | static void | ||
30 | test_strftime (void) | ||
31 | { | ||
32 | @@ -1351,6 +1354,7 @@ test_strftime (void) | ||
33 | } | ||
34 | #endif | ||
35 | } | ||
36 | +#pragma GCC diagnostic pop | ||
37 | |||
38 | static void | ||
39 | test_find_interval (void) | ||
40 | -- | ||
41 | 2.8.0 | ||
42 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch b/meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch new file mode 100644 index 0000000000..d533975100 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 8cdbc7fb2c8c876902e457abe46ee18a0b134486 Mon Sep 17 00:00:00 2001 | ||
2 | From: coypu <coypu@sdf.org> | ||
3 | Date: Wed, 2 Mar 2016 19:38:48 +0200 | ||
4 | Subject: gdate: Move warning pragma outside of function | ||
5 | |||
6 | Commit 0817af40e8c74c721c30f6ef482b1f53d12044c7 breaks the build on | ||
7 | older versions of GCC, which don't allow pragma inside functions. | ||
8 | |||
9 | https://bugzilla.gnome.org/761550 | ||
10 | --- | ||
11 | Upstream-Status: Backport | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | |||
14 | glib/gdate.c | 8 +++++--- | ||
15 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/glib/gdate.c b/glib/gdate.c | ||
18 | index cdc735c..92c34d2 100644 | ||
19 | --- a/glib/gdate.c | ||
20 | +++ b/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 | @@ -2552,3 +2552,5 @@ g_date_strftime (gchar *s, | ||
32 | return retval; | ||
33 | #endif | ||
34 | } | ||
35 | + | ||
36 | +#pragma GCC diagnostic pop | ||
37 | -- | ||
38 | cgit v0.12 | ||
39 | |||