diff options
| author | Adam Vandenberg | 2012-01-22 09:29:27 -0800 |
|---|---|---|
| committer | Adam Vandenberg | 2012-01-22 09:29:27 -0800 |
| commit | c52bac0b663f5f8d48595a1413fa879a7c91bfa5 (patch) | |
| tree | 2c4bf833af1287611377eb5cef1b25da0a161acb | |
| parent | 7d2c1da1ac54f5fae2460b8316f636fffcbb5bfa (diff) | |
| download | homebrew-c52bac0b663f5f8d48595a1413fa879a7c91bfa5.tar.bz2 | |
MySQL: fix patches
| -rw-r--r-- | Library/Formula/mysql.rb | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb index e80ba176f..702c7928e 100644 --- a/Library/Formula/mysql.rb +++ b/Library/Formula/mysql.rb @@ -23,8 +23,6 @@ class Mysql < Formula ] end - # The CMAKE patches are so that on Lion we do not detect a private - # pthread_init function as linkable. def patches DATA end @@ -153,11 +151,13 @@ end __END__ ---- old/scripts/mysqld_safe.sh 2009-09-02 04:10:39.000000000 -0400 -+++ new/scripts/mysqld_safe.sh 2009-09-02 04:52:55.000000000 -0400 -@@ -383,7 +383,7 @@ +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" @@ -165,10 +165,10 @@ __END__ if test "$user" != "root" -o $SET_USER = 1 then diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh -index efc8254..8964b70 100644 +index 9296075..a600de2 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh -@@ -132,7 +132,8 @@ for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \ +@@ -137,7 +137,8 @@ for remove in DDBUG_OFF DSAFE_MUTEX DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \ DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \ 'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \ Xa xstrconst "xc99=none" AC99 \ @@ -178,21 +178,3 @@ index efc8254..8964b70 100644 do # The first option we might strip will always have a space before it because # we set -I$pkgincludedir as the first option -diff --git a/configure.cmake b/configure.cmake -index 0014c1d..21fe471 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -391,7 +391,11 @@ CHECK_FUNCTION_EXISTS (pthread_attr_setscope HAVE_PTHREAD_ATTR_SETSCOPE) - CHECK_FUNCTION_EXISTS (pthread_attr_setstacksize HAVE_PTHREAD_ATTR_SETSTACKSIZE) - CHECK_FUNCTION_EXISTS (pthread_condattr_create HAVE_PTHREAD_CONDATTR_CREATE) - CHECK_FUNCTION_EXISTS (pthread_condattr_setclock HAVE_PTHREAD_CONDATTR_SETCLOCK) --CHECK_FUNCTION_EXISTS (pthread_init HAVE_PTHREAD_INIT) -+ -+IF (NOT CMAKE_OSX_SYSROOT) -+ CHECK_FUNCTION_EXISTS (pthread_init HAVE_PTHREAD_INIT) -+ENDIF (NOT CMAKE_OSX_SYSROOT) -+ - CHECK_FUNCTION_EXISTS (pthread_key_delete HAVE_PTHREAD_KEY_DELETE) - CHECK_FUNCTION_EXISTS (pthread_rwlock_rdlock HAVE_PTHREAD_RWLOCK_RDLOCK) - CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK) - |