From 57b37ed2d671eb7c40c64df085df3e89759278b4 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 20 Nov 2013 21:23:08 -0600 Subject: glib: remove legacy gettext workaround This code actually predates PKG_CONFIG_PATH being configured correctly for keg-only deps. It is no longer needed. --- Library/Formula/glib.rb | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'Library') diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb index f8d9226ab..9d8adec00 100644 --- a/Library/Formula/glib.rb +++ b/Library/Formula/glib.rb @@ -65,18 +65,6 @@ class Glib < Formula system "ulimit -n 1024; make check" if build.include? 'test' system "make install" - # This sucks; gettext is Keg only to prevent conflicts with the wider - # system, but pkg-config or glib is not smart enough to have determined - # that libintl.dylib isn't in the DYLIB_PATH so we have to add it - # manually. - gettext = Formula.factory('gettext').opt_prefix - inreplace lib+'pkgconfig/glib-2.0.pc' do |s| - s.gsub! 'Libs: -L${libdir} -lglib-2.0 -lintl', - "Libs: -L${libdir} -lglib-2.0 -L#{gettext}/lib -lintl" - s.gsub! 'Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include', - "Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I#{gettext}/include" - end - (share+'gtk-doc').rmtree end -- cgit v1.2.3