diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-04-15 12:24:39 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-01 22:16:27 +0200 |
| commit | d470e30e1138661638f89ca8c9ef2ff65730a10c (patch) | |
| tree | 00578f808aaf69a421204194fe5b919436bcbfd8 | |
| parent | cf051f1caa14bec9291bfced69040a72cbea0706 (diff) | |
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@collabora.com>
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | external/serf/StaticLibrary_serf.mk | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a323f78f6f62..7a4fd496d654 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1073,14 +1073,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,\ |