Fixes glib
It compiles, but I am not sure this is safe frankly. The problem is that the OS X iconv is bugged and doesn't have a 64 bit symbol for libiconv_open. Now we must build 64 bit as otherwise everything that links to iconv must be 32 bit too. So we build a static libiconv and link glib to that. This fills in the missing symbol. However glib still dynamically links to /usr/lib/libiconv.dylib, this is the bit I'm not happy with. It can be fixed but I'm guessing it's ok. At least at this stage of Homebrew.master
parent
d3e93c2e14
commit
cc26fd52c9
|
@ -1,5 +1,12 @@
|
||||||
require 'brewkit'
|
require 'brewkit'
|
||||||
|
|
||||||
|
class Libiconv <Formula
|
||||||
|
@url='http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz'
|
||||||
|
@homepage='http://www.gnu.org/software/libiconv/'
|
||||||
|
@md5='7ab33ebd26687c744a37264a330bbe9a'
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
class Glib <Formula
|
class Glib <Formula
|
||||||
@url='http://ftp.acc.umu.se/pub/gnome/sources/glib/2.20/glib-2.20.5.tar.bz2'
|
@url='http://ftp.acc.umu.se/pub/gnome/sources/glib/2.20/glib-2.20.5.tar.bz2'
|
||||||
@md5='4c178b91d82ef80a2da3c26b772569c0'
|
@md5='4c178b91d82ef80a2da3c26b772569c0'
|
||||||
|
@ -11,13 +18,32 @@ class Glib <Formula
|
||||||
end
|
end
|
||||||
|
|
||||||
def install
|
def install
|
||||||
|
|
||||||
|
# Snow Leopard libiconv doesn't have a 64bit version of the libiconv_open
|
||||||
|
# function, which breaks things for us, so we build our own
|
||||||
|
# http://www.mail-archive.com/gtk-list@gnome.org/msg28747.html
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
# indeed, amazingly, -w causes gcc to emit spurious errors for this package!
|
# indeed, amazingly, -w causes gcc to emit spurious errors for this package!
|
||||||
ENV.enable_warnings
|
ENV.enable_warnings
|
||||||
|
|
||||||
|
# basically we are going to statically link to the symbols that glib doesn't
|
||||||
|
# find in the bugged GNU libiconv that ships with 10.6
|
||||||
|
ENV['LDFLAGS'] += " #{iconvd}/lib/libiconv.a"
|
||||||
|
|
||||||
system "./configure", "--disable-debug",
|
system "./configure", "--disable-debug",
|
||||||
"--prefix=#{prefix}",
|
"--prefix=#{prefix}",
|
||||||
"--disable-dependency-tracking",
|
"--disable-dependency-tracking",
|
||||||
"--disable-rebuilds"
|
"--disable-rebuilds",
|
||||||
|
"--with-libiconv=gnu"
|
||||||
system "make"
|
system "make"
|
||||||
system "make install"
|
system "make install"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue