From 8474ab2e89ad76a7132b9f8bfaa5d3d66ab3d527 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 8 Apr 2020 00:44:41 +1000 Subject: [PATCH] boost: fix darwin build --- src/boost-1-fixes.patch | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/boost-1-fixes.patch b/src/boost-1-fixes.patch index 7997d437..e048470c 100644 --- a/src/boost-1-fixes.patch +++ b/src/boost-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: xantares Date: Mon, 28 Sep 2015 08:21:42 +0000 -Subject: [PATCH 1/3] Fix {make,jump}_fcontext visibility with mingw +Subject: [PATCH 1/4] Fix {make,jump}_fcontext visibility with mingw taken from: https://github.com/boostorg/context/pull/22 @@ -57,7 +57,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 28 Feb 2018 19:43:45 +1100 -Subject: [PATCH 2/3] fast-forward asio/ssl from 1.62 release +Subject: [PATCH 2/4] fast-forward asio/ssl from 1.62 release diff --git a/boost/asio/ssl/detail/impl/engine.ipp b/boost/asio/ssl/detail/impl/engine.ipp @@ -550,7 +550,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Fri, 24 Jul 2015 18:50:28 +0100 -Subject: [PATCH 3/3] Remove depricated type_traits usage. +Subject: [PATCH 3/4] Remove depricated type_traits usage. curl -L 'https://patch-diff.githubusercontent.com/raw/boostorg/iostreams/pull/15.patch' | sed 's,include/,,g' | git am @@ -588,3 +588,27 @@ index 1111111..2222222 100644 } // End namespaces detail, iostreams, boost. #endif // BOOST_IOSTREAMS_DETAIL_IS_DEREFERENCEABLE_HPP_INCLUDED + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Wed, 8 Apr 2020 00:37:10 +1000 +Subject: [PATCH 4/4] fix darwin build + + +diff --git a/tools/build/src/tools/darwin.jam b/tools/build/src/tools/darwin.jam +index 1111111..2222222 100644 +--- a/tools/build/src/tools/darwin.jam ++++ b/tools/build/src/tools/darwin.jam +@@ -135,12 +135,6 @@ rule init ( version ? : command * : options * : requirement * ) + + # - Set the toolset generic common options. + common.handle-options darwin : $(condition) : $(command) : $(options) ; +- +- # - GCC 4.0 and higher in Darwin does not have -fcoalesce-templates. +- if $(real-version) < "4.0.0" +- { +- flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ; +- } + # - GCC 4.2 and higher in Darwin does not have -Wno-long-double. + if $(real-version) < "4.2.0" + {