RepositoryExternal.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 3dee92e135ea71e9ee448a43dbf879d62e38f1ec Author: Christian Lohmaier <[email protected]> Date: Tue Nov 13 19:44:44 2012 +0100 library definitions for lcms2 and curl are in Extarnal*Package*_foo.mk using external_project breaks a uniprocessor build since the libraries are only partially copied to solver. Change-Id: I0a83486e466e1c062a1dad89d9ea3d9e78d8c9b1 Reviewed-on: https://gerrit.libreoffice.org/1048 Reviewed-by: Peter Foley <[email protected]> Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Tor Lillqvist <[email protected]> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9808e14..38b1635 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1218,7 +1218,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_lcms2 -$(call gb_LinkTarget_use_external_project,$(1),lcms2) +$(call gb_LinkTarget_use_package,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $$(INCLUDE) \ @@ -1236,7 +1236,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_lcms2 -$(call gb_LinkTarget_use_external_project,$(1),lcms2) +$(call gb_LinkTarget_use_package,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $$(INCLUDE) \ @@ -1527,7 +1527,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_curl -$(call gb_LinkTarget_use_external_project,$(1),curl) +$(call gb_LinkTarget_use_package,$(1),curl) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,curl/include) \ $$(INCLUDE) \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
