Kaydet (Commit) 37f527e9 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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

üst c31e1bae
...@@ -51,14 +51,21 @@ PATCH_FILES= ...@@ -51,14 +51,21 @@ PATCH_FILES=
CONFIGURE_DIR= CONFIGURE_DIR=
.IF "$(OS)"=="MACOSX" .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) \ CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
CPPFLAGS="$(EXTRA_CDEFS)" \ CPPFLAGS="$(EXTRA_CDEFS)" \
CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ 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" \ 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_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ LIBXML2_CFLAGS='$(my_libxml2_cflags)' \
LIBXML2_LIBS="$(LIBXML_LIBS)" LIBXML2_LIBS='$(my_libxml2_libs)'
.IF "$(CROSS_COMPILING)"=="YES" .IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment