diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-05-29 22:21:44 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-05-30 03:17:35 (GMT) |
| commit | 8bd70f6d4428602dbb0931fa13683ac84a2d9dae (patch) | |
| tree | 45ec58798db4037010281d1e74cdff63a309c7b9 /src/libtorrent-rasterbar-1-fixes.patch | |
| parent | dea554d03877640f4345922839e8ececda71fda4 (diff) | |
| download | mxe-8bd70f6d4428602dbb0931fa13683ac84a2d9dae.zip mxe-8bd70f6d4428602dbb0931fa13683ac84a2d9dae.tar.gz mxe-8bd70f6d4428602dbb0931fa13683ac84a2d9dae.tar.bz2 | |
qbittorrent, libtorrent: Boost.Asio is header only
Fix link errors in qbittorrent after libtorrent-rasterbar 1.1.0.
Disable BOOST_ASIO_SEPARATE_COMPILATION
See http://www.boost.org/doc/libs/1_45_0/doc/html/boost_asio/using.html
Diffstat (limited to 'src/libtorrent-rasterbar-1-fixes.patch')
| -rw-r--r-- | src/libtorrent-rasterbar-1-fixes.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/libtorrent-rasterbar-1-fixes.patch b/src/libtorrent-rasterbar-1-fixes.patch new file mode 100644 index 0000000..0e43d23 --- /dev/null +++ b/src/libtorrent-rasterbar-1-fixes.patch @@ -0,0 +1,33 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Mon, 30 May 2016 00:10:30 +0200 +Subject: [PATCH] disable BOOST_ASIO_SEPARATE_COMPILATION + +After upgrading libtorrent-rasterbar to 1.1.0, qbittorrent fails to link +main executable with undefined symbols in boost_asio: + + ./release/application.o:application.cpp:(.text.startup+0x83): + undefined reference to `boost::asio::detail::winsock_init_base::startup + (boost::asio::detail::winsock_init_base::data&, unsigned char, + unsigned char)' + +diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp +index 1111111..2222222 100644 +--- a/include/libtorrent/config.hpp ++++ b/include/libtorrent/config.hpp +@@ -64,10 +64,6 @@ POSSIBILITY OF SUCH DAMAGE. + #error TORRENT_DEBUG_BUFFERS only works if you also disable pool allocators with TORRENT_DISABLE_POOL_ALLOCATOR + #endif + +-#if !defined BOOST_ASIO_SEPARATE_COMPILATION && !defined BOOST_ASIO_DYN_LINK +-#define BOOST_ASIO_SEPARATE_COMPILATION +-#endif +- + #ifndef _MSC_VER + #ifndef __STDC_FORMAT_MACROS + #define __STDC_FORMAT_MACROS 1 |