diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-23 13:49:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 12:40:47 +0300 |
| commit | c535cc8ff6def1da9182f1f978b50ca2089ba5f2 (patch) | |
| tree | 96eab39232a9bdbfafb96908b9749942e062156c | |
| parent | b5751caa1cd5cf1c0e6ef271b0a7418f69357e33 (diff) | |
Avoid automatic linking to Boost libraries in a Windows build
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
| -rw-r--r-- | boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | boost/boost.auto_link.patch | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index 28791eb503d2..75eb479ed3fa 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -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 diff --git a/boost/boost.auto_link.patch b/boost/boost.auto_link.patch new file mode 100644 index 000000000000..556d14e0feea --- /dev/null +++ b/boost/boost.auto_link.patch @@ -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__ + |