summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-16 12:55:25 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-03-16 12:59:52 +0100
commit9fb3182b7ac95fe827142a8dba4238aa5f39caa0 (patch)
treefcfa47ebad32d9788b70c2b50fbc90a20b90ff72
parent81f0c285deb50fcec729168c8736729590c07fa7 (diff)
external/coinmp: Work around -Werror,-Wformat-pedantic
Clang trunk since r231211 with -pedantic-errors now emits "Cbc_C_Interface.cpp:379:55: error: format specifies type 'void *' but the argument has type 'char *' [-Werror,-Wformat-pedantic]" Change-Id: I5d410068f1cd82334f26148df30a45dbc9eabd0a
-rw-r--r--external/coinmp/UnpackedTarball_coinmp.mk1
-rw-r--r--external/coinmp/werror-format-pedantic.patch.010
2 files changed, 11 insertions, 0 deletions
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index 95e40e7550a3..635deff73abc 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
$(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1) \
) \
$(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
+ external/coinmp/werror-format-pedantic.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/werror-format-pedantic.patch.0 b/external/coinmp/werror-format-pedantic.patch.0
new file mode 100644
index 000000000000..a604c4354fc6
--- /dev/null
+++ b/external/coinmp/werror-format-pedantic.patch.0
@@ -0,0 +1,10 @@
+--- Cbc/configure
++++ Cbc/configure
+@@ -3780,7 +3780,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
+ ;;
+ esac
+ esac