diff options
| author | Chad Catlett | 2013-05-23 14:35:25 -0500 |
|---|---|---|
| committer | Adam Vandenberg | 2013-05-24 07:00:01 -0700 |
| commit | 774a77992f65baff84977eaeac87d948cfb71b72 (patch) | |
| tree | 18b3815ada3b620332c0e247aaaa93f927775556 /Library/Formula/weechat.rb | |
| parent | 2f0985b008e48473a17e356d310f4ae48ff51c37 (diff) | |
| download | homebrew-774a77992f65baff84977eaeac87d948cfb71b72.tar.bz2 | |
weechat 0.4.1
* fixes CMake Python detection
Fixes #19168.
Closes #20025.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula/weechat.rb')
| -rw-r--r-- | Library/Formula/weechat.rb | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/Library/Formula/weechat.rb b/Library/Formula/weechat.rb index 952ff6782..bd1ba25e3 100644 --- a/Library/Formula/weechat.rb +++ b/Library/Formula/weechat.rb @@ -2,8 +2,8 @@ require 'formula' class Weechat < Formula homepage 'http://www.weechat.org' - url 'http://www.weechat.net/files/src/weechat-0.4.0.tar.bz2' - sha1 'e4b891d9d3d68196f97d226f487c4a2382d59d99' + url 'http://www.weechat.net/files/src/weechat-0.4.1.tar.bz2' + sha1 'a5185d6b8a2b330713ea354f06601a205270e3a2' depends_on 'cmake' => :build depends_on 'gnutls' @@ -19,6 +19,14 @@ class Weechat < Formula option 'python', 'Build the python module (requires framework Python)' option 'aspell', 'Build the aspell module that checks your spelling' + # cmake finds brewed python when installed, but when searching for the + # libraries it searches for system libraries first. This patch disables + # default search paths and ensures that brewed python is found first, if not + # it falls back to system python. + def patches + DATA + end + def install # Remove all arch flags from the PERL_*FLAGS as we specify them ourselves. # This messes up because the system perl is a fat binary with 32, 64 and PPC @@ -70,3 +78,25 @@ class Weechat < Formula EOS end end + +__END__ +--- weechat-0.4.1-original/cmake/FindPython.cmake 2013-05-20 03:06:14.000000000 -0500 ++++ weechat-0.4.1/cmake/FindPython.cmake 2013-05-23 14:24:33.000000000 -0500 +@@ -41,7 +41,8 @@ + ELSE(ENABLE_PYTHON3) + FIND_PROGRAM(PYTHON_EXECUTABLE + NAMES python2.7 python2.6 python2.5 python +- PATHS /usr/bin /usr/local/bin /usr/pkg/bin ++ PATHS HOMEBREW_PREFIX/bin /usr/bin ++ NO_DEFAULT_PATH + ) + ENDIF(ENABLE_PYTHON3) + +@@ -74,6 +75,7 @@ + FIND_LIBRARY(PYTHON_LIBRARY + NAMES python2.7 python2.6 python2.5 python + PATHS ${PYTHON_POSSIBLE_LIB_PATH} ++ NO_DEFAULT_PATH + ) + ENDIF(ENABLE_PYTHON3) + |