Kaydet (Commit) 98450e64 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 7885f982
......@@ -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:
......@@ -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:
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 = \
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 \
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