patches from Kamal Mostafa <kamal@whence.com> for rules and gcc 4.6.3 issues

[debian/cc1111] / debian / patches / 05_fix_format_not_a_string_literal

diff --git a/debian/patches/05_fix_format_not_a_string_literal b/debian/patches/05_fix_format_not_a_string_literal
new file mode 100644 (file)
index 0000000..79ff308
--- /dev/null
+++ b/debian/patches/05_fix_format_not_a_string_literal
@@ -0,0 +1,28 @@
+Author: Kamal Mostafa <kamal@whence.com>
+Description: Fix instances of "format not a string literal"
+
+Fix these, which are a warning on some gcc versions but an error on gcc 4.6.3:
+
+libcpp/macro.c:1660:15: error: format not a string literal and no format arguments [-Werror=format-security]
+libcpp/macro.c:1673:15: error: format not a string literal and no format arguments [-Werror=format-security]
+
+--- cc1111-2.9.0.orig/support/cpp/libcpp/macro.c
++++ cc1111-2.9.0/support/cpp/libcpp/macro.c
+@@ -1657,7 +1657,7 @@ create_iso_definition (cpp_reader *pfile
+              function-like macros, but not at the end.  */
+           if (following_paste_op)
+             {
+-              cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
++              cpp_error (pfile, CPP_DL_ERROR, "%s", paste_op_error_msg);
+               return false;
+             }
+           break;
+@@ -1670,7 +1670,7 @@ create_iso_definition (cpp_reader *pfile
+              function-like macros, but not at the beginning.  */
+           if (macro->count == 1)
+             {
+-              cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
++              cpp_error (pfile, CPP_DL_ERROR, "%s", paste_op_error_msg);
+               return false;
+             }
+