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

Stop warning in ENV.x11

Browse Source 
It has been long enough since `depends_on :x11` was introduced that we
can make it the caller's responsibility to ensure X11 is present before
invoking ENV.x11, so stop outputting a warning.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-09-03 20:59:49 -05:00
parent 1deb3c0214
commit 33233f5039
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/extend/ENV.rb
View File

@ -246,12 +246,7 @@ module HomebrewEnvExtension
end end
end end
def x11 silent=false def x11
unless MacOS::X11.installed?
opoo "You do not have X11 installed, this formula may not build." unless silent
return
end
# There are some config scripts here that should go in the PATH # There are some config scripts here that should go in the PATH
prepend 'PATH', MacOS::X11.bin, ':' prepend 'PATH', MacOS::X11.bin, ':'

1
Library/Homebrew/test/test_ENV.rb
View File

@ -15,7 +15,6 @@ class EnvironmentTests < Test::Unit::TestCase
ENV.minimal_optimization ENV.minimal_optimization
ENV.no_optimization ENV.no_optimization
ENV.libxml2 ENV.libxml2
ENV.x11 true
ENV.enable_warnings ENV.enable_warnings
assert !ENV.cc.empty? assert !ENV.cc.empty?
assert !ENV.cxx.empty? assert !ENV.cxx.empty?