Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: Iffcf9b199df17a50acf03e29b9deae033396dfcb

2 files changed, 24 insertions, 1 deletions

diff --git a/coin/provisioning/common/macos/libiodbc.rb b/coin/provisioning/common/macos/libiodbc.rb
new file mode 100644
index 00000000..ed669e69
--- /dev/null
+++ b/coin/provisioning/common/macos/libiodbc.rb
@@ -0,0 +1,23 @@
+class Libiodbc < Formula
+  desc "Database connectivity layer based on ODBC. (alternative to unixodbc)"
+  homepage "http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/"
+  url "https://github.com/openlink/iODBC/archive/v3.52.12.tar.gz"
+  sha256 "b2cab4f8fbd5388344d7ee0deb1a32310795b1e631c3505a5b515d90186e2516"
+
+  depends_on "autoconf" => :build
+  depends_on "automake" => :build
+  depends_on "libtool" => :build
+
+  conflicts_with "unixodbc", :because => "both install 'odbcinst.h' header"
+
+  def install
+    system "./autogen.sh"
+    system "./configure", "--prefix=#{prefix}"
+    system "make", "install"
+  end
+
+  test do
+    system bin/"iodbc-config", "--version"
+  end
+end
+
diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh
index 79fa86c2..4ba0bbc3 100755
--- a/coin/provisioning/common/macos/libiodbc.sh
+++ b/coin/provisioning/common/macos/libiodbc.sh
@@ -41,7 +41,7 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 brew update
-brew install libiodbc
+brew install ${BASH_SOURCE%/*}/libiodbc.rb
 
 # CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc