[Libreoffice-commits] .: RepositoryExternal.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 8 18:02:56 PST 2012
RepositoryExternal.mk | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 8905c0e4b0a01297875359282ba4bdd748be0cf1
Author: Peter Foley <pefoley2 at verizon.net>
Date: Thu Nov 8 21:00:30 2012 -0500
fix system lcms2
Change-Id: I1dfb345d3047b59c79454d60747d192a761071ef
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 007f7a4..3c0dc3a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1189,8 +1189,15 @@ $(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
endef
+gb_ExternalProject__use_lcms2 :=
+
else # !SYSTEM_LCMS2
+define gb_ExternalProject__use_lcms2
+$(call gb_ExternalProject_use_package,$(1),lcms2)
+
+endef
+
ifeq ($(OS),ANDROID)
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
@@ -1227,11 +1234,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef
-define gb_ExternalProject__use_lcms2
-$(call gb_ExternalProject_use_package,$(1),lcms2)
-
-endef
-
endif # ANDROID
endif # SYSTEM_LCMS2
More information about the Libreoffice-commits
mailing list