diff options
| author | Jack Nagel | 2013-11-28 19:32:36 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-11-28 19:32:39 -0600 |
| commit | dc5d10cd4976badfffc6fa9192a3d946e9672c7b (patch) | |
| tree | c1f018a10d3e868dedffe515e673afb427ec2538 | |
| parent | 841bf8f838f9cfcaa9651e7b0f8282aa6fe3aab5 (diff) | |
| download | homebrew-dc5d10cd4976badfffc6fa9192a3d946e9672c7b.tar.bz2 | |
Add conflicts_with annotations for mysql-connector-c
Fixes #24756.
| -rw-r--r-- | Library/Formula/mariadb.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/mysql-connector-c.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/mysql.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/percona-server.rb | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/Library/Formula/mariadb.rb b/Library/Formula/mariadb.rb index 84aecd844..515ebe916 100644 --- a/Library/Formula/mariadb.rb +++ b/Library/Formula/mariadb.rb @@ -24,6 +24,8 @@ class Mariadb < Formula conflicts_with 'mysql', 'mysql-cluster', 'percona-server', :because => "mariadb, mysql, and percona install the same binaries." + conflicts_with 'mysql-connector-c', + :because => 'both install MySQL client libraries' env :std if build.universal? diff --git a/Library/Formula/mysql-connector-c.rb b/Library/Formula/mysql-connector-c.rb index d15ead900..f57ef9ca1 100644 --- a/Library/Formula/mysql-connector-c.rb +++ b/Library/Formula/mysql-connector-c.rb @@ -7,8 +7,8 @@ class MysqlConnectorC < Formula depends_on 'cmake' => :build - conflicts_with 'percona-server', - :because => 'both install `mysql_config`' + conflicts_with 'mysql', 'mariadb', 'percona-server', + :because => 'both install MySQL client libraries' fails_with :llvm do build 2334 diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb index eec11aeab..e9c212081 100644 --- a/Library/Formula/mysql.rb +++ b/Library/Formula/mysql.rb @@ -25,6 +25,8 @@ class Mysql < Formula conflicts_with 'mysql-cluster', 'mariadb', 'percona-server', :because => "mysql, mariadb, and percona install the same binaries." + conflicts_with 'mysql-connector-c', + :because => 'both install MySQL client libraries' env :std if build.universal? diff --git a/Library/Formula/percona-server.rb b/Library/Formula/percona-server.rb index 36b50659a..84ddda780 100644 --- a/Library/Formula/percona-server.rb +++ b/Library/Formula/percona-server.rb @@ -20,6 +20,8 @@ class PerconaServer < Formula conflicts_with 'mariadb', 'mysql', 'mysql-cluster', :because => "percona, mariadb, and mysql install the same binaries." + conflicts_with 'mysql-connector-c', + :because => 'both install MySQL client libraries' env :std if build.universal? |