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 Homebrew/homebrew#24952.
This commit is contained in:
parent
a93421caf3
commit
21033add2a
1 changed files with 10 additions and 0 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue