Hi David, On Sun Aug 30 09:30:28 PDT 2015, David Tardon wrote:
[...] > > libcdr: fix build with boost 1.59 > > Change-Id: Ie12338eae161f0a13fa4ff036e41d389bc0d616a > >diff --git a/external/libcdr/ExternalProject_libcdr.mk >b/external/libcdr/ExternalProject_libcdr.mk >index e4d7c9b..96930fe 100644 >--- a/external/libcdr/ExternalProject_libcdr.mk >+++ b/external/libcdr/ExternalProject_libcdr.mk >@@ -36,7 +36,8 @@ $(call >gb_ExternalProject_get_state_target,libcdr,build) : > --disable-werror \ > --disable-weffc \ > $(if > $(verbose),--disable-silent-rules,--enable-silent-rules) \ >- CXXFLAGS="$(if >$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ >+ CXXFLAGS="$(if >$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ >+ -DBOOST_ERROR_CODE_HEADER_ONLY >-DBOOST_SYSTEM_NO_DEPRECATED" \ > $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) > --host= $(HOST_PLATFORM)) \ [...] I assume this was needed to support building external libraries against system boost? There was a change between 1.59-rc1 and 1.59 final in include of error_code.hpp, so that deprecated vars and functions are now exposed. I tried to reverse the logic and patched boost by using #ifdef BOOST_SYSTEM_DEPRECATED instead in this patch [1] but this cannot work against vanilla system boost 1.59 final. Am I right in assuming that the plan would be to drop the patch boost_1_59_0.system.no.deprecated.patch and use the same approach and define -DBOOST_SYSTEM_NO_DEPRECATED? Is -DBOOST_ERROR_CODE_HEADER_ONLY really needed here? In fact, with the patch [1] applied, LO was linking without issue. Thanks David [1] https://svn.boost.org/trac/boost/ticket/11597 _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
