From 3bd1b19798ce1a14914aa3fe0dbfc0e1516655c6 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 5 Dec 2013 01:37:52 -0600 Subject: Revert "glib: remove legacy gettext workaround" Turns out this actually still *is* necessary because gettext does not have a pkgconfig file of its own, and glib-2.0.pc includes references to gettext. This reverts commit 57b37ed2d671eb7c40c64df085df3e89759278b4. Fixes #24952. --- Library/Formula/glib.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Library') diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb index 9d8adec00..ade76d066 100644 --- a/Library/Formula/glib.rb +++ b/Library/Formula/glib.rb @@ -65,6 +65,16 @@ class Glib < Formula system "ulimit -n 1024; make check" if build.include? 'test' system "make install" + # `pkg-config --libs glib-2.0` includes -lintl, and gettext itself does not + # have a pkgconfig file, so we add gettext lib and include paths here. + 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