diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-01-19 12:31:06 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-22 09:32:33 +0100 |
| commit | 41abd684a6d1f3da71084fd854f66e22cb171b9d (patch) | |
| tree | 194a6bb8992820997741408994f1fe80dc3de3b7 /external/libcmis/StaticLibrary_libcmis.mk | |
| parent | tdf#115105 Fix Styles and Macros nodes don't expand in Customize dialog (diff) | |
| download | core-41abd684a6d1f3da71084fd854f66e22cb171b9d.tar.gz core-41abd684a6d1f3da71084fd854f66e22cb171b9d.zip | |
boost: upgrade to release 1.66.0
This claims to support Visual Studio 2017.4, but not the current
2017.5.
* remove boost.auto_link.patch; it does not apply; not sure why we
need this if we can just define BOOST_ALL_NO_LIB
(see commit 7f2e168421c3cd928a31a52a8b5afe97e931d3ba)
* remove some hunks from clang-cl.patch.0 that look fixed upstream
* add a global workaround for spurious GCC warning:
oox/source/drawingml/shape.cxx:921:54: error:
‘oShadowColor.boost::optional_detail::tc_optional_base<int>::m_storage’
may be used uninitialized in this function
[-Werror=maybe-uninitialized]
aFormat.Color = *oShadowColor;
Change-Id: I1eb1d8b66554a84a7d7269f1faaa98695fe2f501
Reviewed-on: https://gerrit.libreoffice.org/48187
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/libcmis/StaticLibrary_libcmis.mk')
| -rw-r--r-- | external/libcmis/StaticLibrary_libcmis.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/external/libcmis/StaticLibrary_libcmis.mk b/external/libcmis/StaticLibrary_libcmis.mk index 39b9545d5345..652ece120a35 100644 --- a/external/libcmis/StaticLibrary_libcmis.mk +++ b/external/libcmis/StaticLibrary_libcmis.mk @@ -34,6 +34,10 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,libcmis, \ )) endif +$(eval $(call gb_StaticLibrary_add_defs,libcmis, \ + -DBOOST_ALL_NO_LIB \ +)) + $(eval $(call gb_StaticLibrary_set_include,libcmis, \ -I$(call gb_UnpackedTarball_get_dir,libcmis/src/libcmis) \ $$(INCLUDE) \ |