wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Vim & MacVim: Fix support for brewed python

Browse source 
However, the downside is that we had to remove python3
support until that is fixed upstream.
This commit is contained in:
Samuel John 2013-06-11 10:46:35 +02:00
parent 72ffc59048
commit 6a4b9d9488
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Formula/macvim.rb
View file

@ -60,7 +60,7 @@ class Macvim < Formula
# on the Mac. Note configure detects brewed python correctly, but that # on the Mac. Note configure detects brewed python correctly, but that
# is ignored. # is ignored.
# See https://github.com/mxcl/homebrew/issues/17908 # See https://github.com/mxcl/homebrew/issues/17908
ENV.prepend 'LDFLAGS', "-L#{python2.libdir} -F#{python2.framework}" if python.brewed? ENV.prepend 'LDFLAGS', "-L#{python2.libdir} -F#{python2.framework}" if python && python.brewed?
unless MacOS::CLT.installed? unless MacOS::CLT.installed?
# On Xcode-only systems: # On Xcode-only systems:

14
Formula/vim.rb
View file

@ -12,21 +12,19 @@ class Vim < Formula
# PATH as the user has set it right now. # PATH as the user has set it right now.
env :std env :std
depends_on :hg => :build if build.head? LANGUAGES = %w(lua mzscheme perl python tcl ruby)
LANGUAGES = %w(lua mzscheme perl python python3 tcl ruby)
DEFAULT_LANGUAGES = %w(ruby python) DEFAULT_LANGUAGES = %w(ruby python)
option "override-system-vi", "Override system vi" option "override-system-vi", "Override system vi"
option "disable-nls", "Build vim without National Language Support (translated messages, keymaps)"
LANGUAGES.each do |language| LANGUAGES.each do |language|
option "with-#{language}", "Build vim with #{language} support" option "with-#{language}", "Build vim with #{language} support"
option "without-#{language}", "Build vim without #{language} support" option "without-#{language}", "Build vim without #{language} support"
end end
depends_on :python unless build.without? 'python' depends_on :hg => :build if build.head?
depends_on :python3 if build.with? 'python3' depends_on :python => :recommended
option "disable-nls", "Build vim without National Language Support (translated messages, keymaps)"
def install def install
ENV['LUA_PREFIX'] = HOMEBREW_PREFIX ENV['LUA_PREFIX'] = HOMEBREW_PREFIX
@ -42,6 +40,8 @@ class Vim < Formula
opts = language_opts opts = language_opts
opts << "--disable-nls" if build.include? "disable-nls" opts << "--disable-nls" if build.include? "disable-nls"
ENV.prepend 'LDFLAGS', "-F#{python.framework}" if python && python.brewed?
# XXX: Please do not submit a pull request that hardcodes the path # XXX: Please do not submit a pull request that hardcodes the path
# to ruby: vim can be compiled against 1.8.x or 1.9.3-p385 and up. # to ruby: vim can be compiled against 1.8.x or 1.9.3-p385 and up.
# If you have problems with vim because of ruby, ensure a compatible # If you have problems with vim because of ruby, ensure a compatible