225d8f31ad
There is no justification why this patch was added, upstream doesn't want to add such a feature[1], and maintaining feature patches in LO for bundled externals doesn't make sense. Also, this doesn't respect the Inet::Settings::ooInetHTTPProxy* settings from the configuration. Let's remove it and hope nobody complains. [1] https://curl.se/mail/lib-2022-05/0083.html Change-Id: I1ccdefb76f69e6795a28d4d25bf443555c16ab0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135182 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
48 lines
1.3 KiB
Makefile
48 lines
1.3 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_UnpackedTarball_UnpackedTarball,curl))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
|
|
|
|
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,curl))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
|
|
|
|
$(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
|
|
winbuild/MakefileBuild.vc \
|
|
))
|
|
|
|
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
|
|
external/curl/curl-msvc.patch.1 \
|
|
external/curl/curl-msvc-zlib.patch.1 \
|
|
external/curl/curl-msvc-disable-protocols.patch.1 \
|
|
external/curl/zlib.patch.0 \
|
|
external/curl/configurable-z-option.patch.0 \
|
|
))
|
|
|
|
ifeq ($(SYSTEM_NSS),)
|
|
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
|
|
external/curl/curl-nss.patch.1 \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(OS)-$(COM_IS_CLANG),WNT-TRUE)
|
|
$(eval $(call gb_UnpackedTarball_add_patches,curl, \
|
|
external/curl/clang-cl.patch.0 \
|
|
))
|
|
endif
|
|
|
|
ifneq ($(filter -fsanitize=%,$(CC)),)
|
|
$(eval $(call gb_UnpackedTarball_add_patches,curl, \
|
|
external/curl/asan-poison-nsspem.patch.0 \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|