[Libreoffice-commits] core.git: 2 commits - Makefile.in RepositoryExternal.mk
Matúš Kukan
matus.kukan at gmail.com
Wed Sep 25 01:22:23 PDT 2013
Makefile.in | 1 +
RepositoryExternal.mk | 12 ++----------
2 files changed, 3 insertions(+), 10 deletions(-)
New commits:
commit fb8d0a4b1313036a2af58ada536ee0171592ebb3
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Sep 25 10:13:09 2013 +0200
don't use use_static_libraries for Android
It shouldn't be used for external libraries, not built by gbuild,
anyway, because it creates wrong dependency.
Change-Id: I889dccb1f934caef7f104d479dbe16185b8eeaf4
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0756b41..f072148 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -976,11 +976,6 @@ else # ANDROID
define gb_LinkTarget__use_librdf
$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
- rdf \
- rasqal \
- raptor2 \
-)
endef
@@ -1046,7 +1041,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
endef
-else # ! SYSTEM_FREETYPE
+else ifeq ($(OS),ANDROID)
define gb_LinkTarget__use_freetype_headers
$(call gb_LinkTarget_set_include,$(1),\
@@ -1058,7 +1053,6 @@ endef
define gb_LinkTarget__use_freetype
$(call gb_LinkTarget_use_external,$(1),freetype_headers)
-$(call gb_LinkTarget_use_static_libraries,$(1),freetype)
endef
@@ -1076,7 +1070,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
endef
-else # ! SYSTEM_FONTCONFIG
+else ifeq ($(OS),ANDROID)
define gb_LinkTarget__use_fontconfig
$(call gb_LinkTarget_set_include,$(1),\
@@ -1084,8 +1078,6 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
-$(call gb_LinkTarget_use_static_libraries,$(1),fontconfig)
-
endef
endif # SYSTEM_FONTCONFIG
commit 58ff5d5f4e694da8b82ff5744af0d815ad9e3e36
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Sep 25 09:44:35 2013 +0200
clean also INSTDIR_FOR_BUILD
Change-Id: Id85d07650f9dd479c5eee7c8c765e59ab1d55955
diff --git a/Makefile.in b/Makefile.in
index da2beb2..0dbf4ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -153,6 +153,7 @@ clean-host:
clean-build:
ifeq ($(CROSS_COMPILING),YES)
+ rm -fr $(INSTDIR_FOR_BUILD)
rm -fr $(OUTDIR_FOR_BUILD)
rm -fr $(WORKDIR_FOR_BUILD)
endif
More information about the Libreoffice-commits
mailing list