nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch

47 lines
1.6 KiB
Diff
Raw Normal View History

--- boost_1_57_0/boost/log/detail/config.hpp 2014-10-29 19:19:00.000000000 -0500
+++ boost_1_57_0/boost/log/detail/config.hpp 2015-05-04 17:56:38.663746100 -0500
@@ -96,11 +96,6 @@
# define BOOST_LOG_BROKEN_CONSTANT_EXPRESSIONS
#endif
-#if defined(__CYGWIN__)
- // Boost.ASIO is broken on Cygwin
-# define BOOST_LOG_NO_ASIO
-#endif
-
#if !defined(BOOST_LOG_USE_NATIVE_SYSLOG) && defined(BOOST_LOG_NO_ASIO)
# ifndef BOOST_LOG_WITHOUT_SYSLOG
# define BOOST_LOG_WITHOUT_SYSLOG
--- boost_1_57_0/libs/log/build/Jamfile.v2 2014-10-29 19:19:00.000000000 -0500
+++ boost_1_57_0/libs/log/build/Jamfile.v2 2015-05-04 22:16:49.242537800 -0500
@@ -170,10 +170,6 @@ project boost/log
<target-os>windows:<library>ws2_32
<target-os>windows:<library>mswsock
- <target-os>cygwin:<define>__USE_W32_SOCKETS
- <target-os>cygwin:<library>ws2_32
- <target-os>cygwin:<library>mswsock
-
<target-os>linux:<library>rt
<target-os>linux:<define>_XOPEN_SOURCE=600
<target-os>linux:<define>_GNU_SOURCE=1
--- boost_1_57_0/libs/log/src/windows_version.hpp 2014-10-29 19:19:00.000000000 -0500
+++ boost_1_57_0/libs/log/src/windows_version.hpp 2015-05-04 23:17:08.281597400 -0500
@@ -18,7 +18,7 @@
#include <boost/log/detail/config.hpp>
-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
+#if defined(BOOST_WINDOWS)
#if defined(BOOST_LOG_USE_WINNT6_API)
@@ -50,6 +50,6 @@
#define WIN32_LEAN_AND_MEAN
#endif
-#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
+#endif // defined(BOOST_WINDOWS)
#endif // BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_