5f321b5011
1.59 upcoming release is needed for MSVC 14.0 (aka VS 2015) support. There is a known breakage on MSVC with boost::none instance in optional library. Use not documented define as explained in this issue upstream [1]: BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE. [1] https://svn.boost.org/trac/boost/ticket/11203 Change-Id: I25b1797da93f7959d15a70105d67100e0e2c4b3b Reviewed-on: https://gerrit.libreoffice.org/17056 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
46 lines
2.1 KiB
Diff
46 lines
2.1 KiB
Diff
diff -ru boost.orig/boost/config/auto_link.hpp boost/boost/config/auto_link.hpp
|
|
--- foo/misc/boost.orig/boost/config/auto_link.hpp 2015-05-07 19:11:52.000000000 +0200
|
|
+++ foo/misc/boost/boost/config/auto_link.hpp 2015-07-18 22:34:14.371946475 +0200
|
|
@@ -367,42 +367,6 @@
|
|
# define BOOST_LIB_PREFIX "lib"
|
|
#endif
|
|
|
|
-//
|
|
-// now include the lib:
|
|
-//
|
|
-#if defined(BOOST_LIB_NAME) \
|
|
- && defined(BOOST_LIB_PREFIX) \
|
|
- && defined(BOOST_LIB_TOOLSET) \
|
|
- && defined(BOOST_LIB_THREAD_OPT) \
|
|
- && defined(BOOST_LIB_RT_OPT) \
|
|
- && defined(BOOST_LIB_VERSION)
|
|
-
|
|
-#ifdef BOOST_AUTO_LINK_TAGGED
|
|
-# pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
|
|
-# ifdef BOOST_LIB_DIAGNOSTIC
|
|
-# pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
|
|
-# endif
|
|
-#elif defined(BOOST_AUTO_LINK_NOMANGLE)
|
|
-# pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
|
|
-# ifdef BOOST_LIB_DIAGNOSTIC
|
|
-# pragma message ("Linking to lib file: " BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
|
|
-# endif
|
|
-#elif defined(BOOST_LIB_BUILDID)
|
|
-# pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION "-" BOOST_STRINGIZE(BOOST_LIB_BUILDID) ".lib")
|
|
-# ifdef BOOST_LIB_DIAGNOSTIC
|
|
-# pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION "-" BOOST_STRINGIZE(BOOST_LIB_BUILDID) ".lib")
|
|
-# endif
|
|
-#else
|
|
-# pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
|
|
-# ifdef BOOST_LIB_DIAGNOSTIC
|
|
-# pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
|
|
-# endif
|
|
-#endif
|
|
-
|
|
-#else
|
|
-# error "some required macros where not defined (internal logic error)."
|
|
-#endif
|
|
-
|
|
|
|
#endif // _MSC_VER || __BORLANDC__
|
|
|