3 files changed, 0 insertions, 98 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 44ee759141e5..21136ed2aec0 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -20,8 +20,6 @@ boost_patches += boost.multi_array.C4510.warnings.patch
 # https://svn.boost.org/trac/boost/ticket/9903
 boost_patches += boost.utility.Wundef.warnings.patch
 
-boost_patches += boost.auto_link.patch
-
 boost_patches += boost.noiconv.patch
 
 boost_patches += ubsan.patch.0
diff --git a/external/boost/boost.auto_link.patch b/external/boost/boost.auto_link.patch
deleted file mode 100644
index ed60dec66e8d..000000000000
--- a/external/boost/boost.auto_link.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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__
- 
diff --git a/external/boost/clang-cl.patch.0 b/external/boost/clang-cl.patch.0
index 6d07df7983fa..3990f27eb3f5 100644
--- a/external/boost/clang-cl.patch.0
+++ b/external/boost/clang-cl.patch.0
@@ -1,42 +1,3 @@
---- boost/date_time/filetime_functions.hpp
-+++ boost/date_time/filetime_functions.hpp
-@@ -27,6 +27,16 @@
- #include <boost/date_time/time.hpp>
- #include <boost/date_time/date_defs.hpp>
- 
-+#if !defined(BOOST_USE_WINDOWS_H)
-+extern "C" {
-+    struct _FILETIME; // Windows Kits/8.1/Include/shared/minwindef.h
-+    struct _SYSTEMTIME; // Windows Kits/8.1/Include/um/minwinbase.h
-+    __declspec(dllimport) void __stdcall GetSystemTimeAsFileTime(_FILETIME* lpFileTime);
-+    __declspec(dllimport) int __stdcall FileTimeToLocalFileTime(const _FILETIME* lpFileTime, _FILETIME* lpLocalFileTime);
-+    __declspec(dllimport) void __stdcall GetSystemTime(_SYSTEMTIME* lpSystemTime);
-+    __declspec(dllimport) int __stdcall SystemTimeToFileTime(const _SYSTEMTIME* lpSystemTime, _FILETIME* lpFileTime);
-+}
-+#endif
- namespace boost {
- 
- namespace date_time {
-@@ -54,10 +64,6 @@
-             boost::uint16_t wMilliseconds;
-         };
- 
--        __declspec(dllimport) void __stdcall GetSystemTimeAsFileTime(FILETIME* lpFileTime);
--        __declspec(dllimport) int __stdcall FileTimeToLocalFileTime(const FILETIME* lpFileTime, FILETIME* lpLocalFileTime);
--        __declspec(dllimport) void __stdcall GetSystemTime(SYSTEMTIME* lpSystemTime);
--        __declspec(dllimport) int __stdcall SystemTimeToFileTime(const SYSTEMTIME* lpSystemTime, FILETIME* lpFileTime);
- 
-     } // extern "C"
- 
-@@ -74,7 +80,7 @@
-         GetSystemTimeAsFileTime(&ft_utc);
-         FileTimeToLocalFileTime(&ft_utc, &ft);
- #elif defined(BOOST_HAS_GETSYSTEMTIMEASFILETIME)
--        GetSystemTimeAsFileTime(&ft);
-+        GetSystemTimeAsFileTime(reinterpret_cast<::_FILETIME *>(&ft));
- #else
-         system_time st;
-         GetSystemTime(&st);
 --- boost/multi_array/base.hpp
 +++ boost/multi_array/base.hpp
 @@ -222,7 +222,7 @@
@@ -57,17 +18,6 @@
    // Deal with VC 2010 output_iterator_tag requirement
    typedef array_iterator<T,T*,mpl::size_t<NumDims>,reference,
                           mutable_iterator_tag> iterator;
---- boost/multi_array/iterator.hpp
-+++ boost/multi_array/iterator.hpp
-@@ -60,7 +60,7 @@
-     , private
-           value_accessor_generator<T,NumDims>::type
- {
--  friend class iterator_core_access;
-+  friend class boost::iterators::iterator_core_access;
-   typedef detail::multi_array::associated_types<T,NumDims> access_t;
- 
-   typedef iterator_facade<
 
 # workdir/UnpackedTarball/boost\boost/smart_ptr/detail/yield_k.hpp(63,29) :  error: 'Sleep' redeclared without 'dllimport' attribute: previous 'dll# import' ignored [-Werror,-Winconsistent-dllimport]
 #   extern "C" void __stdcall Sleep( unsigned long ms );