diff options
| author | Jack Nagel | 2012-09-03 20:59:49 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-09-03 21:04:49 -0500 |
| commit | 33233f5039ed5421ddabe33410424c9c3898c576 (patch) | |
| tree | 2d6aafa254590fc7f2b441d18306ae81c1f1751f /Library | |
| parent | 1deb3c02147c2ec1eeedebd9a461abcfe79d50af (diff) | |
| download | brew-33233f5039ed5421ddabe33410424c9c3898c576.tar.bz2 | |
Stop warning in ENV.x11
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>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 7 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_ENV.rb | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index cbed27746..fda383f6f 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -246,12 +246,7 @@ module HomebrewEnvExtension end end - def x11 silent=false - unless MacOS::X11.installed? - opoo "You do not have X11 installed, this formula may not build." unless silent - return - end - + def x11 # There are some config scripts here that should go in the PATH prepend 'PATH', MacOS::X11.bin, ':' diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test_ENV.rb index 7b71e494f..5b8721747 100644 --- a/Library/Homebrew/test/test_ENV.rb +++ b/Library/Homebrew/test/test_ENV.rb @@ -15,7 +15,6 @@ class EnvironmentTests < Test::Unit::TestCase ENV.minimal_optimization ENV.no_optimization ENV.libxml2 - ENV.x11 true ENV.enable_warnings assert !ENV.cc.empty? assert !ENV.cxx.empty? |