diff options
| author | Mike McQuaid | 2012-07-24 14:14:23 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2012-07-24 14:14:23 +0100 |
| commit | 04f2815022e010fd1120cb6b6ab3b3cbd7c49b8f (patch) | |
| tree | 129238e7c8a53b898445d7faea702be7d20266c9 | |
| parent | 8ab365b6bcb9b7759631f850838b49ad9e84a3a5 (diff) | |
| download | homebrew-04f2815022e010fd1120cb6b6ab3b3cbd7c49b8f.tar.bz2 | |
Fix MySQL no-CLT compilation.
| -rw-r--r-- | Library/Formula/mysql.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb index f2ec76ef0..41498dd59 100644 --- a/Library/Formula/mysql.rb +++ b/Library/Formula/mysql.rb @@ -31,6 +31,7 @@ class Mysql < Formula # Remove optimization flags from `mysql_config --cflags` # This facilitates easy compilation of gems using a brewed mysql + # Also fix compilation with Xcode and no CLT. def patches; DATA; end def install @@ -178,3 +179,16 @@ index 9296075..70c18db 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/cmake/libutils.cmake b/cmake/libutils.cmake +index 89a9de9..677c68d 100644 +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -183,7 +183,7 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE) + # binaries properly) + ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD + COMMAND rm ${TARGET_LOCATION} +- COMMAND /usr/bin/libtool -static -o ${TARGET_LOCATION} ++ COMMAND libtool -static -o ${TARGET_LOCATION} + ${STATIC_LIBS} + ) + ELSE() |