-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #997 from glennpj/glib_gcc
Get glib to compile with gcc-6.1
- Loading branch information
Showing
2 changed files
with
40 additions
and
2 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
var/spack/repos/builtin/packages/glib/g_date_strftime.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
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 | ||
--- | ||
glib/gdate.c | 5 +++++ | ||
1 file changed, 5 insertions(+) | ||
|
||
diff --git a/glib/gdate.c b/glib/gdate.c | ||
index 4aece02..92c34d2 100644 | ||
--- a/glib/gdate.c | ||
+++ b/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 | ||
-- | ||
2.7.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters