diff options
| author | Jack Nagel | 2013-12-05 01:37:52 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-12-05 01:42:31 -0600 |
| commit | 3bd1b19798ce1a14914aa3fe0dbfc0e1516655c6 (patch) | |
| tree | 8061780d0effe03c8a6931e072d0a5dd9587fb6f /Library/Formula | |
| parent | b1da21b387307f154e96447ceee29b7a84906d9a (diff) | |
| download | homebrew-3bd1b19798ce1a14914aa3fe0dbfc0e1516655c6.tar.bz2 | |
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.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/glib.rb | 10 |
1 files changed, 10 insertions, 0 deletions
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 |