From 29ac3efe2e5615ed1c89cc51deac0f2c5d55fbfe Mon Sep 17 00:00:00 2001
From: Adam Vandenberg <flangy@gmail.com>
Date: Mon, 4 Apr 2011 08:48:42 -0700
Subject: [PATCH] brew doctor: update expat check
Apaprently both expat.framework and libexpat.framework exist
and interfere with CMake.
---
Library/Homebrew/cmd/doctor.rb | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index f1aae019e1..570f40014b 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -574,15 +574,17 @@ end
def check_for_other_frameworks
# Other frameworks that are known to cause problems when present
- if File.exist? "/Library/Frameworks/expat.framework"
- puts <<-EOS.undent
- /Library/Frameworks/expat.framework detected
+ ["/Library/Frameworks/expat.framework", "/Library/Frameworks/libexpat.framework"].each do |f|
+ if File.exist? f
+ puts <<-EOS.undent
+ #{f} detected
- This will be picked up by Cmake's build system and likey cause the
- build to fail, trying to link to a 32-bit version of expat.
- You may need to move this file out of the way to compile Cmake.
+ This will be picked up by Cmake's build system and likey cause the
+ build to fail, trying to link to a 32-bit version of expat.
+ You may need to move this file out of the way to compile Cmake.
- EOS
+ EOS
+ end
end
end
--
GitLab