Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update doctor checks for XQuartz

 - pkg-config no longer defaults to checking /usr/X11/lib/pkgconfig;
   instead this path is added via ENV.x11 or depends_on :x11. Formulae
   that expect X11 libs should be explicitly marked as depends_on :x11.
 - Remove warning about /usr/X11 as a symlink.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

Conflicts:

	Library/Homebrew/cmd/doctor.rb
  • Loading branch information...
commit c02248c6aa0cc1d5d8bc3f95742477d98ae26c58 1 parent bed3688
@jacknagel jacknagel authored committed
Showing with 4 additions and 36 deletions.
  1. +4 −36 Library/Homebrew/cmd/doctor.rb
View
40 Library/Homebrew/cmd/doctor.rb
@@ -153,22 +153,10 @@ def check_for_stray_las
end
def check_for_x11
- unless x11_installed?
- <<-EOS.undent
- X11 not installed.
- You don't have X11 installed as part of your OS X installation.
- This is not required for all formulae, but is expected by some.
- EOS
- end
-end
-
-def check_for_nonstandard_x11
- x11 = Pathname.new('/usr/X11')
- if x11.symlink?
- <<-EOS.undent
- /usr/X11 is a symlink
- Homebrew's X11 support has only be tested with Apple's X11.
- In particular, "XQuartz" and "XDarwin" are not known to be compatible.
+ unless x11_installed? then <<-EOS.undent
+ X11 is not installed.
+ You don't have X11 installed as part of your OS X installation.
+ This is not required for all formulae, but is expected by some.
EOS
end
end
@@ -471,26 +459,6 @@ def check_which_pkg_config
end
end
-def check_pkg_config_paths
- binary = `/usr/bin/which pkg-config`.chomp
- return if binary.empty?
-
- pkg_config_paths = `pkg-config --variable pc_path pkg-config`.chomp.split(':')
-
- # Check that all expected paths are being searched
- unless pkg_config_paths.include? "/usr/X11/lib/pkgconfig"
- <<-EOS.undent
- Your pkg-config is not checking "/usr/X11/lib/pkgconfig" for packages.
- Earlier versions of the pkg-config formula did not add this path
- to the search path, which means that other formula may not be able
- to find certain dependencies.
-
- To resolve this issue, re-brew pkg-config with:
- brew rm pkg-config && brew install pkg-config
- EOS
- end
-end
-
def check_for_gettext
if %w[lib/libgettextlib.dylib
lib/libintl.dylib
Please sign in to comment.
Something went wrong with that request. Please try again.