strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid automatic linking to Boost libraries in a Windows build

Browse source 
The library names used in these pragmas dont match what we build
anyway. Whether that should be fixed to conform with "normal" Boost
usage or not, don't know.

Change-Id: I37cb3ff7b340f3362dd7b0fb18ab22188ba54cf6
This commit is contained in:
Tor Lillqvist 2013-05-23 13:49:11 +03:00 committed by Tor Lillqvist
parent b5751caa1c
commit c535cc8ff6
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
boost/UnpackedTarball_boost.mk
View file

@ -36,6 +36,7 @@ boost_patches += boost_1_44_0-clang-warnings.patch
boost_patches += boost_1_44_0-gcc4.8.patch
boost_patches += boost.auto_link.patch
boost_patches += boost.loplugin.patch
boost_patches += boost.std.move.patch
boost_patches += boost.wundef.patch

40
boost/boost.auto_link.patch Normal file
View file

@ -0,0 +1,40 @@
--- foo/foo/foo/boost/config/auto_link.hpp
+++ foo/foo/foo/boost/config/auto_link.hpp
@@ -357,37 +357,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
-#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__