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

Tentative libcroco fix for Mac OS X --without-system-libxml

Browse Source
This commit is contained in:
Stephan Bergmann
2012-02-23 16:26:23 +01:00
parent c31e1bae8e
commit 37f527e989
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libcroco/makefile.mk
View File

@@ -51,14 +51,21 @@ PATCH_FILES=
CONFIGURE_DIR=
.IF "$(OS)"=="MACOSX"
.IF "$(SYSTEM_LIBXML)" == "YES"
my_libxml2_cflags=$(LIBXML_CFLAGS)
my_libxml2_libs=$(LIBXML_LIBS)
.ELSE
my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml
my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2
.ENDIF
CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
CPPFLAGS="$(EXTRA_CDEFS)" \
CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file,@loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \
GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
LIBXML2_LIBS="$(LIBXML_LIBS)"
LIBXML2_CFLAGS='$(my_libxml2_cflags)' \
LIBXML2_LIBS='$(my_libxml2_libs)'
.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)