From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 Apr 2017 09:39:04 +0000 (+0200)
Subject: pkg-config: Fix compilation with newer GCCs
X-Git-Tag: v2.19-core112~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c59597ba49c3bcec23bc5397eb203cddc38cc35;p=ipfire-2.x.git

pkg-config: Fix compilation with newer GCCs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/pkg-config b/lfs/pkg-config
index 3c3b8b27ed..d58fbe2aba 100644
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -42,6 +42,8 @@ else
   PREFIX = /tools
 endif
 
+CFLAGS += Wno-error=format-nonliteral
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -80,6 +82,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP)/glib && patch -Np1 < $(DIR_SRC)/src/patches/pkg-config-0.29-glib-compile-fix.patch
 ifeq "$(ROOT)" ""
 else
 	mkdir -pv /tools/lib/pkgconfig
diff --git a/src/patches/pkg-config-0.29-glib-compile-fix.patch b/src/patches/pkg-config-0.29-glib-compile-fix.patch
new file mode 100644
index 0000000000..a092882ab0
--- /dev/null
+++ b/src/patches/pkg-config-0.29-glib-compile-fix.patch
@@ -0,0 +1,29 @@
+From 0817af40e8c74c721c30f6ef482b1f53d12044c7 Mon Sep 17 00:00:00 2001
+From: coypu <coypu@sdf.org>
+Date: Mon, 8 Feb 2016 00:06:06 +0200
+Subject: 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 | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/glib/gdate.c b/glib/gdate.c
+index 4aece02..cdc735c 100644
+--- a/glib/gdate.c
++++ b/glib/gdate.c
+@@ -2494,7 +2494,10 @@ g_date_strftime (gchar       *s,
+        * recognize whether strftime actually failed or just returned "".
+        */
+       tmpbuf[0] = '\1';
++      #pragma GCC diagnostic push
++      #pragma GCC diagnostic ignored "-Wformat-nonliteral"
+       tmplen = strftime (tmpbuf, tmpbufsize, locale_format, &tm);
++      #pragma GCC diagnostic pop
+ 
+       if (tmplen == 0 && tmpbuf[0] != '\0')
+         {
+-- 
+cgit v0.12
+