3a04cfe27b
<https://dev-www.libreoffice.org/src/boost_1_80_0.tar.xz> has been generated (on Fedora 36) with > $ wget https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2 > $ printf '1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 boost_1_80_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_80_0.html> > boost_1_80_0.tar.bz2: OK > $ external/boost/repack_tarball.sh boost_1_80_0.tar.bz2 > Unpacking boost_1_80_0.tar.bz2 ... > Removing unnecessary files ... > Creating boost_1_80_0.tar.xz ... > Cleaning up ... > 322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666 boost_1_80_0.tar.xz > Done. * In StaticLibrary_boost_filesystem, <36cf9aaf81> "Updated protection of remove_all against CVE-2022-21658 on POSIX" had introduced uses of certain POSIX *at functions (like utimensat) conditionally on some new BOOST_FILESYSTEM_HAS_POSIX_AT_APIS, to be discovered by workdir/UnpackedTarball/boost/libs/filesystem/CMakeLists.txt which we don't run. At least AT_NO_AUTOMOUNT, as used in workdir/UnpackedTarball/boost/libs/filesystem/src/operations.cpp, appears to be unavailable on the macOS baseline, but otherwise assume that all that POSIX functionality is available on all other non-Windows baselines and hardcode that in external/boost/StaticLibrary_boost_filesystem.mk. (If it turns out that we need to exclude some more platforms there, we /might/ need to backport <5864f397cc> "Fixed a missing include on POSIX systems that don't support *at APIs" from the develop branch towards Boost 1.81.) * In StaticLibrary_boost_locale, <41868c62a0> "Support systems without implicit include path" had moved source files around (and then would have failed with > workdir/UnpackedTarball/boost/libs/locale/src/boost/locale/shared/mo_lambda.cpp:7:10: fatal error: 'boost/locale/shared/mo_lambda.hpp' file not found > #include "boost/locale/shared/mo_lambda.hpp" > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ etc. without the additional -I option). * Some Clang builds would have started to fail with > In file included from desktop/qa/unit/desktop-lok-init.cxx:19: > In file included from desktop/inc/lib/init.hxx:20: > In file included from workdir/UnpackedTarball/boost/boost/container/flat_map.hpp:26: > workdir/UnpackedTarball/boost/boost/container/new_allocator.hpp:168:12: error: '__cpp_sized_deallocation' is not defined, evaluates to 0 [-Werror,-Wundef] > # if __cpp_sized_deallocation > ^ so add another external/boost/include/ wrapper. Change-Id: I5e53f7ddab07eadba9bdf653acad571f50517b46 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138511 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
64 lines
2.8 KiB
Makefile
64 lines
2.8 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_StaticLibrary_StaticLibrary,boost_locale))
|
|
|
|
$(eval $(call gb_StaticLibrary_use_unpacked,boost_locale,boost))
|
|
|
|
$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_locale))
|
|
|
|
# disable "auto link" "feature" on MSVC
|
|
$(eval $(call gb_StaticLibrary_add_defs,boost_locale,\
|
|
-DBOOST_ALL_NO_LIB -DBOOST_LOCALE_NO_WINAPI_BACKEND -DBOOST_LOCALE_NO_POSIX_BACKEND -DBOOST_USE_WINDOWS_H \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_set_include,boost_locale, \
|
|
-I$(call gb_UnpackedTarball_get_dir,boost)/libs/locale/src \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_use_external,boost_locale,boost_headers))
|
|
|
|
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_locale,cpp))
|
|
|
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_locale,\
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/encoding/codepage \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/shared/date_time \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/shared/format \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/shared/formatting \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/shared/generator \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/shared/ids \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/shared/localization_backend \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/shared/message \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/shared/mo_lambda \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/std/codecvt \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/std/collate \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/std/converter \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/std/numeric \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/std/std_backend \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/util/codecvt_converter \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/util/default_locale \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/util/gregorian \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/util/info \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/util/locale_data \
|
|
))
|
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_locale,\
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/win32/collate \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/win32/converter \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/win32/lcid \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/win32/numeric \
|
|
UnpackedTarball/boost/libs/locale/src/boost/locale/win32/win_backend \
|
|
))
|
|
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|