mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

library definitions for lcms2 and curl are in Extarnal*Package*_foo.mk

Browse Source 
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 <jpfoley2@gmail.com>
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
This commit is contained in:
Christian Lohmaier
2012-11-13 19:44:44 +01:00
committed by Tor Lillqvist
parent 3d98192d1d
commit 3dee92e135
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RepositoryExternal.mk
View File

@@ -1218,7 +1218,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
)) ))
define gb_LinkTarget__use_lcms2 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),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
$$(INCLUDE) \ $$(INCLUDE) \
@@ -1236,7 +1236,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
)) ))
define gb_LinkTarget__use_lcms2 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),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
$$(INCLUDE) \ $$(INCLUDE) \
@@ -1527,7 +1527,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
)) ))
define gb_LinkTarget__use_curl 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),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,curl/include) \ -I$(call gb_UnpackedTarball_get_dir,curl/include) \
$$(INCLUDE) \ $$(INCLUDE) \