diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-31 01:01:57 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-12-31 01:10:42 +0200 |
| commit | d9584d9a6b017ee8b6f95a14fdec1223eb7dab6b (patch) | |
| tree | e7075a6bdcee2803c58e5de33d0a10f36e8e7296 /redland | |
| parent | 0876c627ddada2855e92203859b815a5f35262c8 (diff) | |
Fix redland cross-compilation at least for Android
Fix typo: It's SYSTEM_LIBXML, not SYSTEM_LIBXML2.
The xml2-config from our patched bundled libxml2 needs LIBXML2LIB.
Need to find raptor-config and rasqal-config (for the HOST platform, that's
fine as they are shell scripts. not binaries) in PATH.
Change-Id: I58376d4ffbc9954c375b4e2b9bad3f68ed12e3bf
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/ExternalProject_raptor.mk | 6 | ||||
| -rw-r--r-- | redland/ExternalProject_rasqal.mk | 3 | ||||
| -rw-r--r-- | redland/ExternalProject_redland.mk | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk index 69650c799531..1571821f2f2c 100644 --- a/redland/ExternalProject_raptor.mk +++ b/redland/ExternalProject_raptor.mk @@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): cd $(EXTERNAL_WORKDIR) \ && CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \ - LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML2)),$(LIBXML_LIBS),-lxml2)" \ + LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \ ./configure --disable-static --enable-shared --disable-gtk-doc --with-openssl-digests \ @@ -50,7 +50,9 @@ $(call gb_ExternalProject_get_state_target,raptor,build): $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)\ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \ - $(if $(filter NO,$(SYSTEM_LIBXML2)),--with-xml2-config=$(OUTDIR)/bin/xml2-config) \ + $(if $(filter NO,$(SYSTEM_LIBXML)), \ + LIBXML2LIB=-lxml2 \ + --with-xml2-config=$(OUTDIR)/bin/xml2-config) \ && $(GNUMAKE) \ && touch $@ endif diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index 99ee3b83334e..084b0be1a391 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -22,7 +22,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): cd $(EXTERNAL_WORKDIR) \ && CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \ - LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML2)),$(LIBXML_LIBS),-lxml2)" \ + LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \ ./configure --disable-static --enable-shared --disable-gtk-doc --with-openssl-digests \ @@ -37,6 +37,7 @@ else $(call gb_ExternalProject_get_state_target,rasqal,build): cd $(EXTERNAL_WORKDIR) \ && CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ + PATH="$(OUTDIR)/bin:$$PATH" \ LDFLAGS="-L$(OUTDIR)/lib \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl$(COMMA)-noinhibit-exec) \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \ diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index 62cf9d5d398b..e9e90d777d7d 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): cd $(EXTERNAL_WORKDIR) \ && CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \ - LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML2)),$(LIBXML_LIBS),-lxml2)" \ + LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \ ./configure --disable-static --disable-gtk-doc --with-openssl-digests \ @@ -36,6 +36,7 @@ else $(call gb_ExternalProject_get_state_target,redland,build): cd $(EXTERNAL_WORKDIR) \ && CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ + PATH="$(OUTDIR)/bin:$$PATH" \ LDFLAGS="-L$(OUTDIR)/lib \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl$(COMMA)-noinhibit-exec) \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \ |