admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Apply userpaths after superenv-setup

Browse Source 
Fixes Homebrew/homebrew#14701. Stupid mistake.
This commit is contained in:
Max Howell 2012-09-13 09:06:37 -04:00
parent ef8a720caa
commit d40bbe5af4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/build.rb
View File

@ -52,7 +52,7 @@ rescue Exception => e
end end
end end
def pre_superenv_hacks f def post_superenv_hacks f
# TODO replace with Formula DSL # TODO replace with Formula DSL
# Python etc. build but then pip can't build stuff. # Python etc. build but then pip can't build stuff.
# Scons resets ENV and then can't find superenv's build-tools. # Scons resets ENV and then can't find superenv's build-tools.
@ -72,6 +72,9 @@ def pre_superenv_hacks f
paths = ORIGINAL_PATHS.map{|pn| pn.realpath.to_s rescue nil } - %w{/usr/X11/bin /opt/X11/bin} paths = ORIGINAL_PATHS.map{|pn| pn.realpath.to_s rescue nil } - %w{/usr/X11/bin /opt/X11/bin}
ENV['PATH'] = "#{ENV['PATH']}:#{paths.join(':')}" ENV['PATH'] = "#{ENV['PATH']}:#{paths.join(':')}"
end end
end
def pre_superenv_hacks f
# fontforge needs 10.7 SDK, wine 32 bit, graphviz has mysteriously missing symbols # fontforge needs 10.7 SDK, wine 32 bit, graphviz has mysteriously missing symbols
# and ruby/python etc. create gem/pip that then won't work # and ruby/python etc. create gem/pip that then won't work
stdenvs = %w{fontforge python python3 ruby ruby-enterprise-edition jruby wine graphviz} stdenvs = %w{fontforge python python3 ruby ruby-enterprise-edition jruby wine graphviz}
@ -112,6 +115,7 @@ def install f
ENV.x11 = f.recursive_requirements.detect{|rq| rq.class == X11Dependency } ENV.x11 = f.recursive_requirements.detect{|rq| rq.class == X11Dependency }
ENV.setup_build_environment ENV.setup_build_environment
f.recursive_requirements.each { |rq| rq.modify_build_environment } f.recursive_requirements.each { |rq| rq.modify_build_environment }
post_superenv_hacks(f)
end end
if f.fails_with? ENV.compiler if f.fails_with? ENV.compiler