diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-06 13:57:22 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-07 09:10:39 -0400 |
| commit | af4630416a33659e9d1257cea27cdae1b9a354d9 (patch) | |
| tree | 09d1901a5863c8c365090c9c6d9e04aee38614f6 /boost | |
| parent | b54f64931471631a698a51496db0a321f095aede (diff) | |
Resurrect boost thread lib. Orcus needs it.
Change-Id: Iadb4a223e4db523b50ee85b9079a7a4ba5971fd0
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/Module_boost.mk | 2 | ||||
| -rw-r--r-- | boost/Package_boostthread.mk | 14 | ||||
| -rw-r--r-- | boost/StaticLibrary_boostthread.mk | 24 |
3 files changed, 40 insertions, 0 deletions
diff --git a/boost/Module_boost.mk b/boost/Module_boost.mk index 0dda414c5f9e..cca44eacf99e 100644 --- a/boost/Module_boost.mk +++ b/boost/Module_boost.mk @@ -13,12 +13,14 @@ ifeq ($(SYSTEM_BOOST),NO) $(eval $(call gb_Module_add_targets,boost,\ StaticLibrary_boostdatetime \ + StaticLibrary_boostthread \ UnpackedTarball_boost \ )) ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,boost,\ Package_boostdatetime \ + Package_boostthread \ )) endif diff --git a/boost/Package_boostthread.mk b/boost/Package_boostthread.mk new file mode 100644 index 000000000000..e79c39a89288 --- /dev/null +++ b/boost/Package_boostthread.mk @@ -0,0 +1,14 @@ +# -*- 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_Package_Package,boostthread,$(gb_StaticLibrary_OUTDIRLOCATION))) + +$(eval $(call gb_Package_add_file,boostthread,lib/libboost_thread-vc90-mt-1_44.lib,$(notdir $(call gb_StaticLibrary_get_target,boostthread)))) + +# vim: set noet sw=4 ts=4: diff --git a/boost/StaticLibrary_boostthread.mk b/boost/StaticLibrary_boostthread.mk new file mode 100644 index 000000000000..1b4c8fe1bfd7 --- /dev/null +++ b/boost/StaticLibrary_boostthread.mk @@ -0,0 +1,24 @@ +# -*- 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_set_warnings_not_errors,boostthread)) + +$(eval $(call gb_StaticLibrary_use_unpacked,boostthread,boost)) + +$(eval $(call gb_StaticLibrary_set_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: |