diff options
author | David Tardon <dtardon@redhat.com> | 2016-03-08 08:24:24 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2016-03-08 09:06:52 +0100 |
commit | 07b3d72efad04e4caa28b3195c5c0bec6e5bd833 (patch) | |
tree | f09773c319a085264c633fba72aff34fe83beac5 /external/boost | |
parent | 23d2e0e8ca3dd34e96f39bf74fe4705ef640330d (diff) |
Boost.Thread appears to be unneeded
Change-Id: I62ec68ed2ff67ac62137de2fcd7106ada90721ae
Diffstat (limited to 'external/boost')
-rw-r--r-- | external/boost/Module_boost.mk | 6 | ||||
-rw-r--r-- | external/boost/StaticLibrary_boostthread.mk | 51 |
2 files changed, 0 insertions, 57 deletions
diff --git a/external/boost/Module_boost.mk b/external/boost/Module_boost.mk index 9aea8dc6d6be..8bb1c0ad7223 100644 --- a/external/boost/Module_boost.mk +++ b/external/boost/Module_boost.mk @@ -17,10 +17,4 @@ $(eval $(call gb_Module_add_targets,boost,\ UnpackedTarball_boost \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_Module_add_targets,boost,\ - StaticLibrary_boostthread \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/boost/StaticLibrary_boostthread.mk b/external/boost/StaticLibrary_boostthread.mk deleted file mode 100644 index f2498d5fdd13..000000000000 --- a/external/boost/StaticLibrary_boostthread.mk +++ /dev/null @@ -1,51 +0,0 @@ -# -*- 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,boostthread)) - -$(eval $(call gb_StaticLibrary_use_unpacked,boostthread,boost)) - -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostthread)) - -# disable "auto link" "feature" on MSVC -$(eval $(call gb_StaticLibrary_add_defs,boostthread,\ - -DBOOST_ALL_NO_LIB \ -)) - -# Lots of the declarations in boost duplicated from windows.h when -# BOOST_USE_WINDOWS_H is not defined (which appears to be the normal case) cause -# warnings or even errors with Clang when windows.h is included too (e.g., -# "conflicting types for 'FileTimeToLocalFileTime'" between -# C:/PROGRA~2/WI3CF2~1/8.1/include/um/fileapi.h and -# workdir/UnpackedTarball/boost/boost/date_time/filetime_functions.hpp), for -# which it appears easies to just define BOOST_USE_WINDOWS_H; also -# -Winvalid-constexpr (e.g., reported from the constexpr definition of lowest() -# in workdir/UnpackedTarball/boost/boost/chrono/duration.hpp, which uses -# std::numeric_limits<>::max() from MSVC's standard library, where nothing is -# marked constexpr) is apparently reported as an error by default: -ifeq ($(OS),WNT) -ifeq ($(COM_IS_CLANG),TRUE) -$(eval $(call gb_StaticLibrary_add_defs,boostthread, \ - -DBOOST_USE_WINDOWS_H \ - -Wno-error=invalid-constexpr \ -)) -endif -endif - -$(eval $(call gb_StaticLibrary_use_external,boostthread,boost_headers)) - -$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostthread,cpp)) - -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostthread,\ - UnpackedTarball/boost/libs/thread/src/win32/thread \ - UnpackedTarball/boost/libs/thread/src/win32/tss_dll \ - UnpackedTarball/boost/libs/thread/src/win32/tss_pe \ -)) - -# vim: set noet sw=4 ts=4: |