mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure glib-mkenums is found when there is no system one

Browse Source 
Change-Id: Ib2c246d0abba0ffe34d6adcc4d63e8fbacc41b74
This commit is contained in:
Tor Lillqvist
2012-10-14 12:21:50 +03:00
parent 7518af82eb
commit f335028a6b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
librsvg/ExternalProject_librsvg.mk
View File

@@ -30,6 +30,6 @@ $(call gb_ExternalProject_get_state_target,librsvg,build) :
LIBRSVG_LIBS="-L$(OUTDIR)/lib -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2) -lcairo -lintl" \
CFLAGS="-I$(OUTDIR)/inc/external -I$(OUTDIR)/inc/external/glib-2.0 -I$(OUTDIR)/inc/external/gdk-pixbuf-2.0 -I$(OUTDIR)/inc/external/pango-1.0 -I$(OUTDIR)/inc/cairo" \
LDFLAGS="$(foreach lib,cairo.2 gio-2.0.0 glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0 intl.8 pango-1.0.0,-Wl,-dylib_file,@loader_path/lib$(lib).dylib:$(OUTDIR)/lib/lib$(lib).dylib) $(if $(filter YES,$(SYSTEM_LIBXML)),,-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)" \
&& $(GNUMAKE) -j$(EXTMAXPROCESS) \
&& PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH $(GNUMAKE) -j$(EXTMAXPROCESS) \
&& touch $@
# vim: set noet sw=4 ts=4: