This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Remove spurious libiconv dependencies

OS X ships with iconv. glib failed to detect it, and this snowballed
into a few formulas requiring a superfluous duplicate install of
libiconv. All of the formulas in this commit compile without the
libiconv dependency.

jn:
The libiconv shipped with 10.5, 10.6, and 10.7 is version 1.11, so there
shouldn't be any cases of "10.x needs a newer libiconv but 10.y does
not".

In any case, we'll wait a week or so just in case any weird issues crop
up, and if not, then we can remove the libiconv formula and blacklist
it.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
  • Loading branch information...
camillol authored and jacknagel committed Feb 25, 2012
1 parent 6206b08 commit ee2c3abdc07a20a5fac07fb298a73d0e2330fb9c
@@ -6,7 +6,6 @@ class Clisp < Formula
homepage 'http://clisp.cons.org/'
md5 '1962b99d5e530390ec3829236d168649'
depends_on 'libiconv'
depends_on 'libsigsegv'
depends_on 'readline'
@@ -15,7 +14,8 @@ class Clisp < Formula
fails_with_llvm "Configure fails on XCode 4/Snow Leopard.", :build => 2334
def patches
{ :p0 => "https://trac.macports.org/export/89054/trunk/dports/lang/clisp/files/patch-src_lispbibl_d.diff" }
{ :p0 => "https://trac.macports.org/export/89054/trunk/dports/lang/clisp/files/patch-src_lispbibl_d.diff",
:p1 => DATA }
end
def install
@@ -59,3 +59,18 @@ def test
system "#{bin}/clisp --version"
end
end
__END__
diff --git a/src/stream.d b/src/stream.d
index 5345ed6..cf14e29 100644
--- a/src/stream.d
+++ b/src/stream.d
@@ -3994,7 +3994,7 @@ global object iconv_range (object encoding, uintL start, uintL end, uintL maxint
nonreturning_function(extern, error_unencodable, (object encoding, chart ch));
/* Avoid annoying warning caused by a wrongly standardized iconv() prototype. */
-#ifdef GNU_LIBICONV
+#if defined(GNU_LIBICONV) && !defined(__APPLE_CC__)
#undef iconv
#define iconv(cd,inbuf,inbytesleft,outbuf,outbytesleft) \
libiconv(cd,(ICONV_CONST char **)(inbuf),inbytesleft,outbuf,outbytesleft)
@@ -5,8 +5,6 @@ class Enca < Formula
homepage 'http://freshmeat.net/projects/enca'
md5 '58fcf1fea7eeab70b64a2d61e14a967d'
depends_on 'libiconv'
def install
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}"
@@ -5,7 +5,6 @@ class Kbtin < Formula
homepage 'http://kbtin.sourceforge.net'
md5 '5e23f48ac72e1609853895b44a0e3e90'
depends_on 'libiconv'
depends_on 'gnutls'
def install
@@ -6,7 +6,6 @@ class Libiptcdata < Formula
md5 'af886556ecb129b694f2d365d03d95a8'
depends_on 'gettext'
depends_on 'libiconv'
def install
system "./configure", "--disable-dependency-tracking",
@@ -1,28 +1,12 @@
require 'formula'
class Libiconv < Formula
url 'http://ftpmirror.gnu.org/libiconv/libiconv-1.13.1.tar.gz'
mirror 'http://ftp.gnu.org/gnu/libiconv/libiconv-1.13.1.tar.gz'
md5 '7ab33ebd26687c744a37264a330bbe9a'
homepage 'http://www.gnu.org/software/libiconv/'
end
class Tin < Formula
homepage 'http://www.tin.org'
url 'ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.0.1.tar.gz'
md5 'd05622db1712a78a2b92aa27904befc2'
def install
iconvd = Pathname.getwd+'iconv'
iconvd.mkpath
Libiconv.new.brew do
system "./configure", "--prefix=#{iconvd}", "--disable-debug", "--disable-dependency-tracking",
"--enable-static", "--disable-shared"
system "make install"
end
ENV.enable_warnings
ENV['LDFLAGS'] = " #{iconvd}/lib/libiconv.a"
system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", "--mandir=#{man}"
system "make build"
system "make install"
@@ -1,18 +1,17 @@
require 'formula'
class Wv2 < Formula
url 'http://downloads.sourceforge.net/project/wvware/wv2/0.3.1/wv2-0.3.1.tar.bz2'
url 'http://downloads.sourceforge.net/project/wvware/wv2-0.4.2.tar.bz2'
homepage 'http://wvware.sourceforge.net/'
md5 '4a20200141cb1299055f2bf13b56989d'
md5 '850ed8e44a84e7bf0610747827018cbc'
depends_on 'pkg-config' => :build
depends_on 'glib'
depends_on 'libgsf'
depends_on 'libiconv'
def install
system "./configure", "--disable-debug", "--disable-dependency-tracking",
"--prefix=#{prefix}"
ENV.append 'LDFLAGS', '-liconv -lgobject-2.0' # work around broken detection
system "cmake #{std_cmake_parameters} ."
system "make install"
end
end

0 comments on commit ee2c3ab

Please sign in to comment.