43928f72e7
libiconv is listed inside the glib formula as a dep, and glib has a universal option. This does not. Therefore, glib --universal will fail to link. This commit gives the user the option to build libiconv as a universal library. It compiled successfully on 64bit OSX 10.6.8 using all three XCode 4.0.2 compilers. Closes Homebrew/homebrew#7748. Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
49 lines
1.6 KiB
Ruby
49 lines
1.6 KiB
Ruby
require 'formula'
|
|
|
|
class Libiconv < Formula
|
|
url 'http://ftpmirror.gnu.org/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 => [
|
|
'http://svn.macports.org/repository/macports/trunk/dports/textproc/libiconv/files/patch-Makefile.devel',
|
|
'http://svn.macports.org/repository/macports/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)
|