aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamillo Lugaresi2012-02-25 03:25:43 -0600
committerJack Nagel2012-03-13 19:38:17 -0500
commitad702070704437ecca5e34d6cadcd9cb380eeb70 (patch)
tree5558eb9e07e02a15141c59d54d3ccaf157d02082
parentcb010f639d1cce83897c562b569be757ef258435 (diff)
downloadhomebrew-ad702070704437ecca5e34d6cadcd9cb380eeb70.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 #10464. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
-rw-r--r--Library/Formula/libiconv.rb50
-rw-r--r--Library/Homebrew/blacklist.rb5
-rw-r--r--Library/Homebrew/cmd/doctor.rb2
3 files changed, 6 insertions, 51 deletions
diff --git a/Library/Formula/libiconv.rb b/Library/Formula/libiconv.rb
deleted file mode 100644
index d573b6889..000000000
--- a/Library/Formula/libiconv.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'formula'
-
-class Libiconv < Formula
- url 'http://ftpmirror.gnu.org/libiconv/libiconv-1.14.tar.gz'
- mirror 'http://ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz'
- homepage 'http://www.gnu.org/software/libiconv/'
- md5 'e34509b1623cec449dfeb73d7ce9c6c6'
-
- keg_only :provided_by_osx, <<-EOS.undent
- A few software packages require this newer version of libiconv.
- Please use this dependency very sparingly.
- EOS
-
- def patches
- { :p1 => [
- 'https://trac.macports.org/export/89276/trunk/dports/textproc/libiconv/files/patch-Makefile.devel',
- 'https://trac.macports.org/export/89276/trunk/dports/textproc/libiconv/files/patch-utf8mac.diff',
- DATA
- ]}
- end
-
- def options
- [[ '--universal', 'Build a universal library.' ]]
- end
-
- def install
- ENV.universal_binary if ARGV.build_universal?
- ENV.j1
- system "./configure", "--disable-debug", "--disable-dependency-tracking",
- "--prefix=#{prefix}",
- "--enable-extra-encodings"
- system "make -f Makefile.devel"
- system "make install"
- end
-end
-
-
-__END__
-diff --git a/lib/flags.h b/lib/flags.h
-index d7cda21..4cabcac 100644
---- a/lib/flags.h
-+++ b/lib/flags.h
-@@ -14,6 +14,7 @@
-
- #define ei_ascii_oflags (0)
- #define ei_utf8_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO)
-+#define ei_utf8mac_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO)
- #define ei_ucs2_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO)
- #define ei_ucs2be_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO)
- #define ei_ucs2le_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO)
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