diff options
| author | Jack Nagel | 2012-07-17 12:37:10 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-07-19 02:59:56 -0500 |
| commit | ccde069be78dc18a57ab8bb4626ab946e4ae5768 (patch) | |
| tree | 57d8718fba68554272e0e81fd6fd29a19e5e7c79 /Library/Formula | |
| parent | d74d0328f0ae3b0a0b39495ca926fdfe338b0e51 (diff) | |
| download | homebrew-ccde069be78dc18a57ab8bb4626ab946e4ae5768.tar.bz2 | |
glib 2.32.4
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/glib.rb | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb index 105c9d3d5..1a169af3c 100644 --- a/Library/Formula/glib.rb +++ b/Library/Formula/glib.rb @@ -4,9 +4,10 @@ def build_tests?; ARGV.include? '--test'; end class Glib < Formula homepage 'http://developer.gnome.org/glib/' - url 'ftp://ftp.gnome.org/pub/gnome/sources/glib/2.32/glib-2.32.3.tar.xz' - sha256 'b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d' + url 'ftp://ftp.gnome.org/pub/gnome/sources/glib/2.32/glib-2.32.4.tar.xz' + sha256 'a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2' + depends_on 'pkg-config' => :build depends_on 'xz' => :build depends_on 'gettext' depends_on 'libffi' @@ -26,7 +27,7 @@ class Glib < Formula https://raw.github.com/gist/2246469/591586214960f7647b1454e7d547c3935988a0a7/glib-configurable-paths.diff ]} p[:p0] = %W[ - https://trac.macports.org/export/92183/trunk/dports/devel/glib2/files/patch-configure.diff + https://trac.macports.org/export/95596/trunk/dports/devel/glib2/files/patch-configure.diff ] if ARGV.build_universal? p end @@ -53,21 +54,10 @@ class Glib < Formula --localstatedir=#{var} ] - # glib and pkg-config 0.26 have circular dependencies, so we should build glib without pkg-config - # The pkg-config dependency can be eliminated if certain env variables are set - # Note that this *may* need to be updated if any new dependencies are added in the future - # See http://permalink.gmane.org/gmane.comp.package-management.pkg-config/627 - ENV['ZLIB_CFLAGS'] = '' - ENV['ZLIB_LIBS'] = '-lz' - # libffi include paths are dramatically ugly - libffi = Formula.factory('libffi') - ENV['LIBFFI_CFLAGS'] = "-I #{libffi.lib}/libffi-#{libffi.version}/include" - ENV['LIBFFI_LIBS'] = '-lffi' - system "./configure", *args if ARGV.build_universal? - system "curl 'https://trac.macports.org/export/92179/trunk/dports/devel/glib2/files/config.h.ed' | ed - config.h" + system "curl 'https://trac.macports.org/export/95596/trunk/dports/devel/glib2/files/config.h.ed' | ed - config.h" end system "make" |