[Libreoffice-commits] core.git: 6 commits - external/firebird external/glew external/lcms2 external/libetonyek external/libmwaw external/libodfgen external/liborcus external/librevenge external/libwpd external/libwpg external/libwps external/redland
David Tardon
dtardon at redhat.com
Fri Jun 5 05:50:35 PDT 2015
external/firebird/ExternalPackage_firebird.mk | 2 +-
external/firebird/ExternalProject_firebird.mk | 6 +++++-
external/glew/ExternalPackage_glew.mk | 2 +-
external/lcms2/ExternalPackage_lcms2.mk | 2 +-
external/lcms2/ExternalProject_lcms2.mk | 6 +++++-
external/libetonyek/ExternalPackage_libetonyek.mk | 2 +-
external/libmwaw/ExternalPackage_libmwaw.mk | 2 +-
external/libodfgen/ExternalPackage_libodfgen.mk | 2 +-
external/liborcus/ExternalPackage_liborcus.mk | 2 +-
external/librevenge/ExternalPackage_librevenge.mk | 2 +-
external/libwpd/ExternalPackage_libwpd.mk | 2 +-
external/libwpg/ExternalPackage_libwpg.mk | 2 +-
external/libwps/ExternalPackage_libwps.mk | 2 +-
external/redland/ExternalPackage_raptor.mk | 2 +-
external/redland/ExternalPackage_rasqal.mk | 2 +-
external/redland/ExternalPackage_redland.mk | 2 +-
external/redland/ExternalProject_raptor.mk | 6 +++++-
external/redland/ExternalProject_rasqal.mk | 6 +++++-
external/redland/ExternalProject_redland.mk | 6 +++++-
19 files changed, 39 insertions(+), 19 deletions(-)
New commits:
commit 9eb1bfcbb164a8d029d7ba92947e0c9caf8e0826
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jun 5 14:49:17 2015 +0200
use $(DISABLE_DYNLOADING)
Change-Id: Ie5738e1ec1c77fc2b356e43bcf763a40e383f52f
diff --git a/external/redland/ExternalPackage_raptor.mk b/external/redland/ExternalPackage_raptor.mk
index c355105..4a81a16 100644
--- a/external/redland/ExternalPackage_raptor.mk
+++ b/external/redland/ExternalPackage_raptor.mk
@@ -17,7 +17,7 @@ else ifeq ($(OS)-$(COM),WNT-GCC)
$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2-$(RAPTOR_MAJOR).dll,src/.libs/libraptor2-$(RAPTOR_MAJOR).dll))
else ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2.dll,src/.libs/libraptor2.dll))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2-lo.so.$(RAPTOR_MAJOR),src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0))
endif
diff --git a/external/redland/ExternalPackage_rasqal.mk b/external/redland/ExternalPackage_rasqal.mk
index 85b47a1..ebe519a 100644
--- a/external/redland/ExternalPackage_rasqal.mk
+++ b/external/redland/ExternalPackage_rasqal.mk
@@ -17,7 +17,7 @@ else ifeq ($(OS)-$(COM),WNT-GCC)
$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal-$(RASQAL_MAJOR).dll,src/.libs/librasqal-$(RASQAL_MAJOR).dll))
else ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal.dll,src/.libs/librasqal.dll))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal-lo.so.$(RASQAL_MAJOR),src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0))
endif
diff --git a/external/redland/ExternalPackage_redland.mk b/external/redland/ExternalPackage_redland.mk
index eb20b75..d37ae86 100644
--- a/external/redland/ExternalPackage_redland.mk
+++ b/external/redland/ExternalPackage_redland.mk
@@ -17,7 +17,7 @@ else ifeq ($(OS)-$(COM),WNT-GCC)
$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf-$(REDLAND_MAJOR).dll,src/.libs/librdf-$(REDLAND_MAJOR).dll))
else ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf.dll,src/.libs/librdf.dll))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf-lo.so.$(REDLAND_MAJOR),src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0))
endif
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
index eaffcf1..f083609 100644
--- a/external/redland/ExternalProject_raptor.mk
+++ b/external/redland/ExternalProject_raptor.mk
@@ -47,7 +47,11 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
--without-xslt-config \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
- $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+ $(if $(DISABLE_DYNLOADING), \
+ --enable-static --disable-shared \
+ , \
+ --enable-shared --disable-static \
+ ) \
$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
)
diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
index 4d3f65c..2e05abe 100644
--- a/external/redland/ExternalProject_rasqal.mk
+++ b/external/redland/ExternalProject_rasqal.mk
@@ -56,7 +56,11 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
--with-digest-library=internal \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
- $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+ $(if $(DISABLE_DYNLOADING), \
+ --enable-static --disable-shared \
+ , \
+ --enable-shared --disable-static \
+ ) \
$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
index 9852e3f..9c8f3ab 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/external/redland/ExternalProject_redland.mk
@@ -60,7 +60,11 @@ $(call gb_ExternalProject_get_state_target,redland,build):
--without-postgresql --without-threestone --without-virtuoso \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
- $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+ $(if $(DISABLE_DYNLOADING), \
+ --enable-static --disable-shared \
+ , \
+ --enable-shared --disable-static \
+ ) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
commit bf8086238bc9cc2ac0fa231d0b2dd0c519b1b6d9
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jun 5 14:47:47 2015 +0200
simplify condition
Change-Id: I9e69e9d7fc8d3c0ccd393efca75be04c710fee6a
diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk
index 06339c5..07f6ddb 100644
--- a/external/lcms2/ExternalPackage_lcms2.mk
+++ b/external/lcms2/ExternalPackage_lcms2.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2))
$(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2))
-ifneq ($(DISABLE_DYNLOADING),TRUE)
+ifeq ($(DISABLE_DYNLOADING),)
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib))
else ifeq ($(OS),WNT)
commit d611d33cac8ae35f41d5f300ca096f2f74e374c6
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jun 5 14:46:30 2015 +0200
use $(DISABLE_DYNLOADING)
Change-Id: I0636f45bf5653ff3feabfdc2742eb767f1b84507
diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index dd98222..441222a 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -30,7 +30,11 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
CPPFLAGS=" $(SOLARINC)" \
CFLAGS='$(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))' \
$(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \
- $(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static, --enable-shared --disable-static) \
+ $(if $(DISABLE_DYNLOADING), \
+ --enable-static --disable-shared \
+ , \
+ --enable-shared --disable-static \
+ ) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
&& cd src \
&& $(MAKE) \
commit 970458c5ee4e6077836839397e556132544a3b6e
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jun 5 14:45:32 2015 +0200
use $(DISABLE_DYNLOADING)
Change-Id: I8312cbd8cd349e2adf2d34c7cb7be220f038e017
diff --git a/external/glew/ExternalPackage_glew.mk b/external/glew/ExternalPackage_glew.mk
index 6678a69..40c78f8 100644
--- a/external/glew/ExternalPackage_glew.mk
+++ b/external/glew/ExternalPackage_glew.mk
@@ -26,7 +26,7 @@ else ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_files,glew,$(LIBO_LIB_FOLDER), \
bin/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/$(glew_arch_subdir)/glew32d.dll,Release/$(glew_arch_subdir)/glew32.dll) \
))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.so.1.10,lib/libGLEW.so.1.10.0))
endif
commit 9516798af0cfb0d36654f636cf8752f1c313e74b
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jun 5 14:44:52 2015 +0200
use $(DISABLE_DYNLOADING)
Change-Id: I0997be4c4ae92f697b19b162674efcb8278eaf3a
diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk
index 59b938b..98917f8 100644
--- a/external/firebird/ExternalPackage_firebird.mk
+++ b/external/firebird/ExternalPackage_firebird.mk
@@ -15,7 +15,7 @@ ifeq ($(OS)-$(COM),WNT-MSC)
$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
else ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
-else
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2))
endif
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index ed802c3..d2607f0 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -52,7 +52,11 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--with-system-icu --without-fbsample --without-fbsample-db \
$(if $(ENABLE_DEBUG),--enable-debug) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+ $(if $(DISABLE_DYNLOADING), \
+ --enable-static --disable-shared \
+ , \
+ --enable-shared --disable-static \
+ ) \
&& $(if $(filter WNT,$(OS)),\
PATH="$(shell cygpath -u $(call gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
$(gb_Helper_set_ld_path)) \
commit 05c1a94a5485a68ffc1d1f6de6919b00995dc800
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jun 5 14:42:18 2015 +0200
use $(DISABLE_DYNLOADING) consistently
Change-Id: Iec611290770ae0393eb787a3883bb22a12340b0a
diff --git a/external/libetonyek/ExternalPackage_libetonyek.mk b/external/libetonyek/ExternalPackage_libetonyek.mk
index 08f0a63b..80b0a54 100644
--- a/external/libetonyek/ExternalPackage_libetonyek.mk
+++ b/external/libetonyek/ExternalPackage_libetonyek.mk
@@ -15,7 +15,7 @@ ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.1.dylib,src/lib/.libs/libetonyek-0.1.1.dylib))
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.dll,src/lib/.libs/libetonyek-0.1.dll))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.so.1,src/lib/.libs/libetonyek-0.1.so.1.0.$(ETONYEK_VERSION_MICRO)))
endif
diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk b/external/libmwaw/ExternalPackage_libmwaw.mk
index 97a6e6d..b6bda7d 100644
--- a/external/libmwaw/ExternalPackage_libmwaw.mk
+++ b/external/libmwaw/ExternalPackage_libmwaw.mk
@@ -15,7 +15,7 @@ ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.3.dylib,src/lib/.libs/libmwaw-0.3.3.dylib))
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.$(MWAW_VERSION_MICRO)))
endif
diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk b/external/libodfgen/ExternalPackage_libodfgen.mk
index 1708430..efdbd21 100644
--- a/external/libodfgen/ExternalPackage_libodfgen.mk
+++ b/external/libodfgen/ExternalPackage_libodfgen.mk
@@ -15,7 +15,7 @@ ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.1.dylib,src/.libs/libodfgen-0.1.1.dylib))
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.dll,src/.libs/libodfgen-0.1.dll))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.$(ODFGEN_VERSION_MICRO)))
endif
diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk
index 96899e7..4411592 100644
--- a/external/liborcus/ExternalPackage_liborcus.mk
+++ b/external/liborcus/ExternalPackage_liborcus.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.10.0.dylib,src/liborcus/.libs/liborcus-0.10.0.dylib))
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.10.0.dylib,src/parser/.libs/liborcus-parser-0.10.0.dylib))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.10.so.0,src/liborcus/.libs/liborcus-0.10.so.0.0.0))
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.10.so.0,src/parser/.libs/liborcus-parser-0.10.so.0.0.0))
endif
diff --git a/external/librevenge/ExternalPackage_librevenge.mk b/external/librevenge/ExternalPackage_librevenge.mk
index 9766bfb..bde4344 100644
--- a/external/librevenge/ExternalPackage_librevenge.mk
+++ b/external/librevenge/ExternalPackage_librevenge.mk
@@ -15,7 +15,7 @@ ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.0.dylib,src/lib/.libs/librevenge-0.0.0.dylib))
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.dll,src/lib/.libs/librevenge-0.0.dll))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.so.0,src/lib/.libs/librevenge-0.0.so.0.0.2))
endif
diff --git a/external/libwpd/ExternalPackage_libwpd.mk b/external/libwpd/ExternalPackage_libwpd.mk
index 51badef..23d639b 100644
--- a/external/libwpd/ExternalPackage_libwpd.mk
+++ b/external/libwpd/ExternalPackage_libwpd.mk
@@ -15,7 +15,7 @@ ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.10.dylib,src/lib/.libs/libwpd-0.10.10.dylib))
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.dll,src/lib/.libs/libwpd-0.10.dll))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.so.10,src/lib/.libs/libwpd-0.10.so.10.0.0))
endif
diff --git a/external/libwpg/ExternalPackage_libwpg.mk b/external/libwpg/ExternalPackage_libwpg.mk
index c03a5cf..fcaab4e 100644
--- a/external/libwpg/ExternalPackage_libwpg.mk
+++ b/external/libwpg/ExternalPackage_libwpg.mk
@@ -15,7 +15,7 @@ ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.3.dylib,src/lib/.libs/libwpg-0.3.3.dylib))
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.dll,src/lib/.libs/libwpg-0.3.dll))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.so.3,src/lib/.libs/libwpg-0.3.so.3.0.0))
endif
diff --git a/external/libwps/ExternalPackage_libwps.mk b/external/libwps/ExternalPackage_libwps.mk
index 034900c..182589f 100644
--- a/external/libwps/ExternalPackage_libwps.mk
+++ b/external/libwps/ExternalPackage_libwps.mk
@@ -15,7 +15,7 @@ ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.4.dylib,src/lib/.libs/libwps-0.4.4.dylib))
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.dll,src/lib/.libs/libwps-0.4.dll))
-else ifeq ($(filter IOS ANDROID,$(OS)),)
+else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.so.4,src/lib/.libs/libwps-0.4.so.4.0.$(WPS_VERSION_MICRO)))
endif
More information about the Libreoffice-commits
mailing list