src/Makefile.am | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
New commits: commit ddd6bf12f1cabaa298feed820313483b9893528c Author: Behdad Esfahbod <[email protected]> Date: Tue Aug 18 15:55:09 2015 +0100 Don't declare dependency on freetype in harfbuzz.pc See comments. diff --git a/src/Makefile.am b/src/Makefile.am index 132683a..856aae6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -149,7 +149,12 @@ endif if HAVE_FREETYPE HBCFLAGS += $(FREETYPE_CFLAGS) HBLIBS += $(FREETYPE_LIBS) -HBDEPS += $(FREETYPE_DEPS) +# XXX +# The following creates a recursive dependency on FreeType if FreeType is +# built with HarfBuzz support enabled. Newer pkg-config handles that just +# fine but pkg-config 0.26 as shipped in Ubuntu 14.04 crashes. Remove +# in a year or two, or otherwise work around it... +#HBDEPS += $(FREETYPE_DEPS) HBSOURCES += hb-ft.cc HBHEADERS += hb-ft.h endif _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
