redland/UnpackedTarball_rasqal.mk | 1 + redland/UnpackedTarball_redland.mk | 1 + redland/rasqal/rasqal-xcompile.patch.1 | 15 +++++++++++++++ redland/redland/redland-xcompile.patch.1 | 15 +++++++++++++++ 4 files changed, 32 insertions(+)
New commits: commit 98450e64e19ae3ffe0c1973799f402bb54777791 Author: Tor Lillqvist <[email protected]> Date: Wed Apr 3 15:13:55 2013 +0300 Fix Android build of redland and rasqal Instead of bothering to pass in -lxml and -lm so that the test and/or util executables get built, just patch out building them when cross-compiling. Change-Id: Ida38dcdc56675eca6ff9d549ce62b15da8e82f13 diff --git a/redland/UnpackedTarball_rasqal.mk b/redland/UnpackedTarball_rasqal.mk index 4da1944..ef28ea7 100644 --- a/redland/UnpackedTarball_rasqal.mk +++ b/redland/UnpackedTarball_rasqal.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\ $(if $(filter-out WNT,$(OS)),redland/rasqal/rasqal-bundled-soname.patch.1) \ $(if $(filter ANDROID,$(OS)),redland/rasqal/rasqal-android.patch.1) \ $(if $(filter WNTGCC,$(OS)$(COM)),redland/rasqal/rasqal-mingw.patch.1) \ + $(if $(filter YES,$(CROSS_COMPILING)),redland/rasqal/rasqal-xcompile.patch.1) \ )) # vim: set noet sw=4 ts=4: diff --git a/redland/UnpackedTarball_redland.mk b/redland/UnpackedTarball_redland.mk index 2b38a48..dd2a15c 100644 --- a/redland/UnpackedTarball_redland.mk +++ b/redland/UnpackedTarball_redland.mk @@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\ $(if $(filter-out WNT,$(OS)),redland/redland/redland-bundled-soname.patch.1) \ $(if $(filter ANDROID,$(OS)),redland/redland/redland-android.patch.1) \ $(if $(filter WNTGCC,$(OS)$(COM)),redland/redland/redland-mingw.patch.1) \ + $(if $(filter YES,$(CROSS_COMPILING)),redland/redland/redland-xcompile.patch.1) \ )) # vim: set noet sw=4 ts=4: diff --git a/redland/rasqal/rasqal-xcompile.patch.1 b/redland/rasqal/rasqal-xcompile.patch.1 new file mode 100644 index 0000000..546975c --- /dev/null +++ b/redland/rasqal/rasqal-xcompile.patch.1 @@ -0,0 +1,15 @@ +No point in creating util or test executables when cross-compiling. +(Especially as doing it anyway wouldn't work without tweaks to have it find +libxml2 and libm, at least for Android.) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -358,7 +358,7 @@ + top_srcdir = @top_srcdir@ + noinst_SCRIPTS = rasqal-src-config + ACLOCAL_AMFLAGS = -I build +-SUBDIRS = src utils tests docs data win32 scripts ++SUBDIRS = src docs data win32 scripts + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = rasqal.pc + EXTRA_DIST = \ diff --git a/redland/redland/redland-xcompile.patch.1 b/redland/redland/redland-xcompile.patch.1 new file mode 100644 index 0000000..2635359 --- /dev/null +++ b/redland/redland/redland-xcompile.patch.1 @@ -0,0 +1,15 @@ +No point in creating example or util executables when cross-compiling. +(Especially as doing it anyway wouldn't work without tweaks to have it find +libxml2 and libm, at least for Android.) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -395,7 +395,7 @@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc + + # Subdirectories to build/install/distribute etc. +-SUBDIRS = $(subdirs) src examples utils demos docs data scripts ++SUBDIRS = $(subdirs) src docs data scripts + EXTRA_DIST = \ + ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \ + ChangeLog.5 ChangeLog.6 ChangeLog.7 ChangeLog.8 ChangeLog.9 ChangeLog.10 \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
