diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-12-14 16:03:46 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-12-15 15:24:09 +0100 |
| commit | f45b7871e7d31dfc6ed31d1b79928990bba0d0dd (patch) | |
| tree | 9683de781929364754b78b87aead27e61d4f9c94 /RepositoryExternal.mk | |
| parent | 1a038e6ee1c29eafb267e035104b2a2a05714f15 (diff) | |
ucb: remove --with-webdav=serf
Remove code in ucb/source/ucp/webdav, and now unused externals
apr, apr-util, serf.
Change-Id: I31ab8bb1491f5290e175e87f2b30499811c5a359
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126835
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 73 |
1 files changed, 1 insertions, 72 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fbb02d802142..dbe4d8e28ba4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1080,78 +1080,7 @@ endef endif # SYSTEM_LIBLANGTAG -gb_ExternalProject__use_apr := - -ifeq ($(WITH_WEBDAV),serf) - -define gb_LinkTarget__use_apr -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(APR_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),\ - $(APR_LIBS) \ - $(if $(filter $(OS),LINUX),-lpthread) \ - $(if $(filter $(OS),MACOSX),-liconv) \ -) - -ifeq ($(SYSTEM_APR),) -$(call gb_LinkTarget_use_system_win32_libs,$(1),\ - mswsock \ - rpcrt4 \ - shell32 \ -) -$(call gb_LinkTarget_add_defs,$(1),\ - -DAPR_DECLARE_STATIC \ - -DAPU_DECLARE_STATIC \ -) -$(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,full) -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),\ - $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(SERF_CFLAGS)))) \ - $$(INCLUDE) \ -) - -$(call gb_LinkTarget_add_libs,$(1),\ - $(SERF_LIBS) \ -) - -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) +ifeq ($(WITH_WEBDAV),neon) ifneq ($(SYSTEM_NEON),) |