Library_merged.mk | 5 +++-- configure.ac | 9 ++++++++- 2 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit 873d2149f76b2031a8bc83daba3d6fad7560588a Author: Tor Lillqvist <[email protected]> Date: Fri Apr 12 02:37:46 2013 +0300 No point in even considering mergelibs for Android or iOS Change-Id: I2b587946f094cd4e83f4148d6e3359452ec36bf6 diff --git a/configure.ac b/configure.ac index 96ddaf7..cd9f0d0 100644 --- a/configure.ac +++ b/configure.ac @@ -11633,8 +11633,15 @@ fi # =================================================================== AC_MSG_CHECKING([whether to create huge library]) MERGELIBS= + +if test $_os = iOS -o $_os = Android; then + # Never any point in mergelibs for these as we build just static + # libraries anyway... + enable_mergelibs=no +fi + if test "$enable_mergelibs" != "no"; then - if test $_os != Linux -a $_os != Android -a $_os != WINNT; then + if test $_os != Linux -a $_os != WINNT; then add_warning "--enable-mergelibs is not tested for this platform" fi if test "$enable_mergelibs" = "all"; then commit ebb09ee4f0b9691895d81c77666b141241683175 Author: Tor Lillqvist <[email protected]> Date: Fri Apr 12 02:32:42 2013 +0300 No jvmaccess or jvmfwk library unless SOLAR_JAVA Change-Id: I676c1305d997d756456245264e68676666f75c7e diff --git a/Library_merged.mk b/Library_merged.mk index 7385553..59edec1 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -34,8 +34,9 @@ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ i18nlangtag \ - jvmaccess \ - jvmfwk \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess \ + jvmfwk) \ sal \ salhelper \ tl \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
