fc7464a882
> w32-util.c(176,1): error: conflicting types for 'utf8_to_wchar' > utf8_to_wchar (const char *string) > ^ > workdir/UnpackedTarball/libgpg-error/src\gpg-error.h(1109,10): note: previous declaration is here > wchar_t *utf8_to_wchar (const char *string, size_t length, size_t *retlen); > ^ with clang-cl on Windows, while in a case like this where there is only one definition, the mismatching declaration merely gets warned about by MSVC with "warning C4029: declared formal parameter list different from definition". (And on non-Windows that w32-util.c apparently doesn't get compiled at all.) Change-Id: I76cfc3ec086325c527c04dbe0e8341cb9b775c50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100091 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
34 lines
1.5 KiB
Makefile
34 lines
1.5 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,gpgmepp))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_tarball,gpgmepp,$(GPGME_TARBALL)))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_patchlevel,gpgmepp,0))
|
|
|
|
$(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
|
|
external/gpgmepp/find-libgpg-error-libassuan.patch \
|
|
external/gpgmepp/fix-autoconf-macros.patch \
|
|
external/gpgmepp/add-minimal-keyexport.patch \
|
|
$(if $(filter MSC,$(COM)),external/gpgmepp/w32-build-fixes.patch.1) \
|
|
$(if $(filter MSC,$(COM)),external/gpgmepp/w32-disable-docs.patch.1) \
|
|
$(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-win32-macro.patch.1) \
|
|
$(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-libtool.patch.1) \
|
|
$(if $(filter MSC,$(COM)),external/gpgmepp/w32-add-initializer.patch.1) \
|
|
external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1 \
|
|
external/gpgmepp/w32-build-fixes-2.patch \
|
|
$(if $(filter LINUX,$(OS)),external/gpgmepp/asan.patch) \
|
|
$(if $(filter LINUX,$(OS)),external/gpgmepp/rpath.patch) \
|
|
external/gpgmepp/gcc9.patch \
|
|
external/gpgmepp/ubsan.patch \
|
|
external/gpgmepp/c++20.patch \
|
|
external/gpgmepp/clang-cl.patch \
|
|
))
|
|
# vim: set noet sw=4 ts=4:
|