aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorCamillo Lugaresi2012-02-25 03:25:43 -0600
committerJack Nagel2012-03-13 19:38:17 -0500
commitc59be1a930fa1237e3ea84dca9c484037f1ba5a1 (patch)
tree67c3186ce8fe4ae09f1b373103eaf940a07f0cb7 /Library
parent6ded0d0cbbde5fcd387a6ad75f6e44d83899ef51 (diff)
downloadbrew-c59be1a930fa1237e3ea84dca9c484037f1ba5a1.tar.bz2
Remove libiconv duplicate
Commit ee2c3ab ("Remove spurious libiconv dependencies") pruned all existing "depends_on 'libiconv'" usages from Homebrew in preparation for removing the libiconv dupe itself. Now that is done, and we can remove and blacklist it. It can be obtained from Homebrew-alt. Closes Homebrew/homebrew#10464. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/blacklist.rb5
-rw-r--r--Library/Homebrew/cmd/doctor.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/Library/Homebrew/blacklist.rb b/Library/Homebrew/blacklist.rb
index 33758eccc..d9f2dceb1 100644
--- a/Library/Homebrew/blacklist.rb
+++ b/Library/Homebrew/blacklist.rb
@@ -6,6 +6,11 @@ def blacklisted? name
when 'libarchive', 'libpcap' then <<-EOS.undent
Apple distributes #{name} with OS X, you can find it in /usr/lib.
EOS
+ when 'libiconv' then <<-EOS.undent
+ Apple distributes #{name} with OS X, you can find it in /usr/lib.
+ Some build scripts fail to detect it correctly, please check existing
+ formulae for solutions.
+ EOS
when 'libxml', 'libxlst' then <<-EOS.undent
Apple distributes #{name} with OS X, you can find it in /usr/lib.
However not all build scripts look for these hard enough, so you may need
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 5e6b982c3..808b2db81 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -340,7 +340,7 @@ def check_xcode_prefix
if prefix.to_s.match(' ')
<<-EOS.undent
Xcode is installed to a directory with a space in the name.
- This will cause some formulae, such as libiconv, to fail to build.
+ This will cause some formulae to fail to build.
EOS
end
end