diff options
| author | Jack Nagel | 2012-03-21 11:16:13 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-03-21 14:40:34 -0500 |
| commit | 1cd1d4807cbb188d8fb88cd397fc4bbb403f22ac (patch) | |
| tree | 167ba2ba7b190eeac168a8fe1c8d881ca40e3edb | |
| parent | bc0f31d911ba35b1a85850ca2688c6929a6873e3 (diff) | |
| download | homebrew-1cd1d4807cbb188d8fb88cd397fc4bbb403f22ac.tar.bz2 | |
mysql: remove no-op patch
Closes #10842.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Formula/mysql.rb | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb index 340fb7d7e..6ba8af3b7 100644 --- a/Library/Formula/mysql.rb +++ b/Library/Formula/mysql.rb @@ -25,9 +25,9 @@ class Mysql < Formula ] end - def patches - DATA - end + # Remove optimization flags from `mysql_config --cflags` + # This facilitates easy compilation of gems using a brewed mysql + def patches; DATA; end def install # Make sure the var/mysql directory exists @@ -159,22 +159,6 @@ end __END__ -diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh -index 0d2045a..2fdd5ce 100644 ---- a/scripts/mysqld_safe.sh -+++ b/scripts/mysqld_safe.sh -@@ -558,7 +558,7 @@ else - fi - - USER_OPTION="" --if test -w / -o "$USER" = "root" -+if test -w /sbin -o "$USER" = "root" - then - if test "$user" != "root" -o $SET_USER = 1 - then - -# Remove optimization flags from `mysql-config --cflags` -# This facilitates easy compilation of gems using a brewed mysql diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 9296075..70c18db 100644 --- a/scripts/mysql_config.sh |