RepositoryExternal.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 23a324d282865d2a95142e0c758d266f1a0dc080
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Oct 30 13:18:40 2012 +0200
Try to fix a highly parallel build of libcmis with a non-system curl
The problem us that gb_LinkTarget__use_curl only declared a dependency
on an *unpacked* curl tarball, but the curlbuild.h file is *generated*
during curl configury. So something that depends on a (non-system)
curl needs to depend on curl having been configured at least. Let's
try like this.
Change-Id: I87b2a3292807d9bb873c3656caf58c4d98d8f622
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 23f14ad..ca87908 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1624,7 +1624,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,
\
))
define gb_LinkTarget__use_curl
-$(call gb_LinkTarget_use_unpacked,$(1),curl)
+$(call gb_LinkTarget_use_external_project,$(1),curl)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,curl/include) \
$$(INCLUDE) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
