diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-04-14 20:37:13 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-04-14 23:59:04 +0200 |
| commit | af6674ce681b8427d0171a88f212a7034334c9e1 (patch) | |
| tree | 62904fed680ea55274b8417067384242b8891811 /RepositoryExternal.mk | |
| parent | 80fbc9c49fd23fcf1900fe12ebdc6f43f8db7b7f (diff) | |
update serf to 1.3.9
Its build system has switches to scons, so build the library
using gbuild.
Change-Id: I45b784e65e4987c25baf3fa1477816c744663bf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114107
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e30fe9a1bb57..7b49abb2757d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1107,21 +1107,40 @@ endif endef +ifneq ($(SYSTEM_SERF),) + define gb_LinkTarget__use_serf +$(call gb_LinkTarget_add_defs,$(1),\ + $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(SERF_CFLAGS))) \ +) + $(call gb_LinkTarget_set_include,$(1),\ - $(SERF_CFLAGS) \ + $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(SERF_CFLAGS)))) \ $$(INCLUDE) \ ) + $(call gb_LinkTarget_add_libs,$(1),\ $(SERF_LIBS) \ ) -ifeq ($(SYSTEM_SERF),) -$(call gb_LinkTarget_use_external_project,$(1),serf) -endif +endef + +else # !SYSTEM_SERF + +define gb_LinkTarget__use_serf +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,serf) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_use_static_libraries,$(1),\ + serf \ +) endef +endif # SYSTEM_SERF + else ifeq ($(WITH_WEBDAV),neon) ifneq ($(SYSTEM_NEON),) |