diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-08 13:17:28 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-03 17:53:57 +0100 |
commit | 36788e95fdbe96ac27c71197fdbfee178b53f52c (patch) | |
tree | 31c45984896a72ee3c1aaaeca2a5ba0d1ad06104 /external/boost | |
parent | fdo#61320: Allow user to choose whether to create thumbnails inside odf. (diff) | |
download | core-36788e95fdbe96ac27c71197fdbfee178b53f52c.tar.gz core-36788e95fdbe96ac27c71197fdbfee178b53f52c.zip |
upgrade liborcus
Conflicts:
external/boost/StaticLibrary_boost_system.mk
Change-Id: Ie4af26c87a100b67baeedbaa7fb1ac428845f92b
Diffstat (limited to 'external/boost')
-rw-r--r-- | external/boost/Module_boost.mk | 3 | ||||
-rw-r--r-- | external/boost/StaticLibrary_boost_iostreams.mk | 35 | ||||
-rw-r--r-- | external/boost/StaticLibrary_boost_system.mk (renamed from external/boost/StaticLibrary_boostsystem.mk) | 14 |
3 files changed, 44 insertions, 8 deletions
diff --git a/external/boost/Module_boost.mk b/external/boost/Module_boost.mk index 1a21a770476d..5bac25e98fe2 100644 --- a/external/boost/Module_boost.mk +++ b/external/boost/Module_boost.mk @@ -11,7 +11,8 @@ $(eval $(call gb_Module_Module,boost)) $(eval $(call gb_Module_add_targets,boost,\ StaticLibrary_boostdatetime \ - StaticLibrary_boostsystem \ + StaticLibrary_boost_system \ + StaticLibrary_boost_iostreams \ UnpackedTarball_boost \ )) diff --git a/external/boost/StaticLibrary_boost_iostreams.mk b/external/boost/StaticLibrary_boost_iostreams.mk new file mode 100644 index 000000000000..f3049ba2570e --- /dev/null +++ b/external/boost/StaticLibrary_boost_iostreams.mk @@ -0,0 +1,35 @@ +# -*- 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_iostreams)) + +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_iostreams)) + +# disable "auto link" "feature" on MSVC +$(eval $(call gb_StaticLibrary_add_defs,boost_iostreams,\ + -DBOOST_ALL_NO_LIB \ +)) + +$(eval $(call gb_StaticLibrary_use_unpacked,boost_iostreams,boost)) + + +$(eval $(call gb_StaticLibrary_use_externals,boost_iostreams, \ + zlib \ + boost_headers \ +)) + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_iostreams,cpp)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_iostreams,\ + UnpackedTarball/boost/libs/iostreams/src/zlib \ + UnpackedTarball/boost/libs/iostreams/src/gzip \ + UnpackedTarball/boost/libs/iostreams/src/file_descriptor \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/boost/StaticLibrary_boostsystem.mk b/external/boost/StaticLibrary_boost_system.mk index 818d4cfcffc1..03970afa41d3 100644 --- a/external/boost/StaticLibrary_boostsystem.mk +++ b/external/boost/StaticLibrary_boost_system.mk @@ -7,22 +7,22 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_StaticLibrary_StaticLibrary,boostsystem)) +$(eval $(call gb_StaticLibrary_StaticLibrary,boost_system)) -$(eval $(call gb_StaticLibrary_use_unpacked,boostsystem,boost)) +$(eval $(call gb_StaticLibrary_use_unpacked,boost_system,boost)) -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostsystem)) +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_system)) # disable "auto link" "feature" on MSVC -$(eval $(call gb_StaticLibrary_add_defs,boostsystem,\ +$(eval $(call gb_StaticLibrary_add_defs,boost_system,\ -DBOOST_ALL_NO_LIB \ )) -$(eval $(call gb_StaticLibrary_use_external,boostsystem,boost_headers)) +$(eval $(call gb_StaticLibrary_use_external,boost_system,boost_headers)) -$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostsystem,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_system,cpp)) -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostsystem,\ +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_system,\ UnpackedTarball/boost/libs/system/src/error_code \ )) |