From 9fb3182b7ac95fe827142a8dba4238aa5f39caa0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 16 Mar 2015 12:55:25 +0100
Subject: 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
---
 external/coinmp/UnpackedTarball_coinmp.mk      |  1 +
 external/coinmp/werror-format-pedantic.patch.0 | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 external/coinmp/werror-format-pedantic.patch.0

(limited to 'external')

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
-- 
cgit