diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2023-05-23 16:28:57 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2023-05-23 16:28:57 +0900 |
| commit | 0d4b4c255c5aa5281c80e6edc0c40fa7e1888f2f (patch) | |
| tree | 826c1b49271ee2bbe9e08aa3a2c45ffd73314ded | |
| parent | 096c90ac8a82154b69e41dc376353eb80ce1eaec (diff) | |
| download | boost-accepted/tizen_7.0_base.tar.gz boost-accepted/tizen_7.0_base.tar.bz2 boost-accepted/tizen_7.0_base.zip | |
Add asio scheduler null check patchaccepted/tizen/7.0/base/20230524.074111tizen_7.0_baseaccepted/tizen_7.0_base
https://github.com/chriskohlhoff/asio/issues/642
Change-Id: I498a076bb7fca6610ebab71d2370d0230f90ec67
| -rw-r--r-- | packaging/asio_scheduler.patch | 17 | ||||
| -rw-r--r-- | packaging/boost.spec | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/packaging/asio_scheduler.patch b/packaging/asio_scheduler.patch new file mode 100644 index 0000000000..4217534aac --- /dev/null +++ b/packaging/asio_scheduler.patch @@ -0,0 +1,17 @@ +diff --git a/boost/asio/detail/impl/scheduler.ipp b/boost/asio/detail/impl/scheduler.ipp +index 4ef5c86688..3955625d15 100644 +--- a/boost/asio/detail/impl/scheduler.ipp ++++ b/boost/asio/detail/impl/scheduler.ipp +@@ -317,8 +317,10 @@ void scheduler::restart() + + void scheduler::compensating_work_started() + { +- thread_info_base* this_thread = thread_call_stack::contains(this); +- ++static_cast<thread_info*>(this_thread)->private_outstanding_work; ++ if (thread_info_base* this_thread = thread_call_stack::contains(this)) ++ { ++ ++static_cast<thread_info*>(this_thread)->private_outstanding_work; ++ } + } + + void scheduler::post_immediate_completion( diff --git a/packaging/boost.spec b/packaging/boost.spec index ee07ef77a8..97363cb0f9 100644 --- a/packaging/boost.spec +++ b/packaging/boost.spec @@ -69,6 +69,7 @@ Source1: boost-rpmlintrc Source4: existing_extra_docs Source1001: boost.manifest Source1002: boost.pc +Source1003: asio_scheduler.patch %define _docdir %{_datadir}/doc/packages/boost-%{version} @@ -396,6 +397,7 @@ Run-time support for Boost.Nowide. %setup -q -n %{name}_%{version} cp %{SOURCE1001} . cp %{SOURCE1002} . +%{__patch} -p1 < %{SOURCE1003} #everything in the tarball has the executable flag set ... find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} + |