101fa3fc1e
...which is apparently enabled at least in MSVC 2019 16.8.3 when building with --with-latest-c++ (i.e., /std:c++latest): > C:/lo/core/workdir/UnpackedTarball/clucene/src/contribs-lib/CLucene/analysis/PorterStemmer.cpp(124): error C2664: 'bool lucene::analysis::PorterStemmer::ends(TCHAR *)': cannot convert argument 1 from 'const wchar_t [5]' to 'TCHAR *' > C:/lo/core/workdir/UnpackedTarball/clucene/src/contribs-lib/CLucene/analysis/PorterStemmer.cpp(124): note: Conversion from string literal loses const qualifier (see /Zc:strictStrings) > C:/lo/core/workdir/UnpackedTarball/clucene/src/contribs-lib/CLucene/analysis/PorterStemmer.cpp(97): note: see declaration of 'lucene::analysis::PorterStemmer::ends' etc. (and which is not silenced by gb_Library_set_warnings_disabled in external/clucene/Library_clucene.mk, unlike the corresponding Clang/GCC -Wwrite-strings) Change-Id: Id3c8eefa4658bf942de6c8ae9b219212eba79995 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108840 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
77 lines
3.5 KiB
Makefile
77 lines
3.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,clucene))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_tarball,clucene,$(CLUCENE_TARBALL)))
|
|
|
|
ifneq ($(OS),WNT)
|
|
$(eval $(call gb_UnpackedTarball_set_post_action,clucene,\
|
|
mkdir -p inc/internal/CLucene/util && \
|
|
mv src/shared/CLucene/util/dirent.h inc/internal/CLucene/util \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_patchlevel,clucene,0))
|
|
|
|
# clucene-multimap-put.patch was proposed upstream, see
|
|
# http://sourceforge.net/mailarchive/message.php?msg_id=29143260
|
|
# clucene-mutex.patch was proposed upstream, see
|
|
# http://sourceforge.net/mailarchive/message.php?msg_id=32314782
|
|
# clucene-asan.patch was proposed upstream, see
|
|
# http://sourceforge.net/mailarchive/message.php?msg_id=32367781
|
|
# see msvc14.0 error report on:
|
|
# https://connect.microsoft.com/VisualStudio/feedback/details/1424082/vs2015-rc-c-compiler-mixes-up-template-parameter-with-identical-named-inherited-typedef
|
|
# ostream-wchar_t.patch was proposed upstream, see
|
|
# <https://sourceforge.net/p/clucene/mailman/message/36989348/>
|
|
# heap-buffer-overflow.patch was proposed upstream, see
|
|
# <https://sourceforge.net/p/clucene/mailman/message/36991067/>
|
|
# c++20.patch was proposed upstream, see
|
|
# <https://sourceforge.net/p/clucene/mailman/message/37040362/>
|
|
$(eval $(call gb_UnpackedTarball_add_patches,clucene,\
|
|
external/clucene/patches/clucene-debug.patch \
|
|
external/clucene/patches/clucene-multimap-put.patch \
|
|
external/clucene/patches/clucene-narrowing-conversions.patch \
|
|
external/clucene/patches/clucene-nullptr.patch \
|
|
external/clucene/patches/clucene-warnings.patch \
|
|
external/clucene/patches/clucene-aix.patch \
|
|
external/clucene/patches/clucene-git1-win64.patch \
|
|
external/clucene/patches/clucene-ub.patch \
|
|
external/clucene/patches/clucene-mutex.patch \
|
|
external/clucene/patches/clucene-asan.patch \
|
|
external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch \
|
|
external/clucene/patches/ostream-wchar_t.patch \
|
|
external/clucene/patches/heap-buffer-overflow.patch \
|
|
external/clucene/patches/c++20.patch \
|
|
external/clucene/patches/write-strings.patch \
|
|
))
|
|
|
|
ifneq ($(OS),WNT)
|
|
$(eval $(call gb_UnpackedTarball_add_patches,clucene,\
|
|
external/clucene/patches/clucene-libcpp.patch \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-MSVC.h))
|
|
$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MSVC.h))
|
|
else # ! $(OS),WNT
|
|
ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE)
|
|
$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-GCC-atomic.h))
|
|
else
|
|
$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-generic.h))
|
|
endif
|
|
ifeq ($(OS),LINUX)
|
|
$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-LINUX.h))
|
|
else
|
|
$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-generic.h))
|
|
endif
|
|
endif # $(OS),WNT
|
|
|
|
# vim: set noet sw=4 ts=4:
|