[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - external/serf RepositoryExternal.mk

[Luboš Luňák (via logerrit)]

 RepositoryExternal.mk               |    4 ++--
 external/serf/StaticLibrary_serf.mk |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 28837f4466050c06de1974a9ea963d2c23a0a3b9
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Thu Apr 15 12:24:39 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Apr 16 10:55:13 2021 +0200

    fix serf dependencies
    
    RepositoryExternal.mk treats apr and apr_util as one external, but
    technically they are two, so both of it must be built for 'apr'
    to be ready to be used by serf.
    
    Change-Id: If00fb10a698fd926437e18ac0e4fa66b2722ebae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114135
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 01faf862f423..5db36ebad3d0 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1095,14 +1095,14 @@ $(call gb_LinkTarget_add_defs,$(1),\
 	-DAPR_DECLARE_STATIC \
 	-DAPU_DECLARE_STATIC \
 )
-$(call gb_LinkTarget_use_external_project,$(1),apr_util)
+$(call gb_LinkTarget_use_external_project,$(1),apr_util,full)
 endif
 
 endef
 
 define gb_ExternalProject__use_apr
 ifeq ($(SYSTEM_APR),)
-$(call gb_ExternalProject_use_external_project,$(1),apr_util)
+$(call gb_ExternalProject_use_external_project,$(1),apr_util,full)
 endif
 
 endef
diff --git a/external/serf/StaticLibrary_serf.mk b/external/serf/StaticLibrary_serf.mk
index f202ddc1da4b..e04eef72da44 100644
--- a/external/serf/StaticLibrary_serf.mk
+++ b/external/serf/StaticLibrary_serf.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,serf,serf))
 $(eval $(call gb_StaticLibrary_use_externals,serf,\
     apr \
     openssl \
+    zlib \
 ))
 
 $(eval $(call gb_StaticLibrary_set_include,serf,\