File tree 2 files changed +21
-0
lines changed
2 files changed +21
-0
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ $(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(su
4
4
$(package)_file_name =boost_$($(package ) _version) .tar.bz2
5
5
$(package)_sha256_hash =d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee
6
6
$(package)_dependencies =native_b2
7
+ $(package)_patches =commit-74fb0a2.patch
7
8
8
9
define $(package)_set_vars
9
10
$(package ) _config_opts_release=variant=release
@@ -29,6 +30,7 @@ $(package)_cxxflags_android=-fPIC
29
30
endef
30
31
31
32
define $(package)_preprocess_cmds
33
+ patch -p2 -i $($(package ) _patch_dir) /commit-74fb0a2.patch && \
32
34
echo "using $($(package ) _toolset_$(host_os ) ) : : $($(package ) _cxx) : <cflags>\"$($(package ) _cflags) \" <cxxflags>\"$($(package ) _cxxflags) \" <compileflags>\"$($(package ) _cppflags) \" <linkflags>\"$($(package ) _ldflags) \" <archiver>\"$($(package ) _ar) \" <striper>\"$(host_STRIP ) \" <ranlib>\"$(host_RANLIB ) \" <rc>\"$(host_WINDRES ) \" : ;" > user-config.jam
33
35
endef
34
36
Original file line number Diff line number Diff line change
1
+ From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
2
+ From: Rob Boehne <robb@datalogics.com>
3
+ Date: Wed, 20 Nov 2019 11:25:20 -0600
4
+ Subject: Revert change to elide a warning that caused Solaris builds to fail.
5
+
6
+
7
+ diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
8
+ index aefbeb43..bc9b1367 100644
9
+ --- a/include/boost/thread/pthread/thread_data.hpp
10
+ +++ b/include/boost/thread/pthread/thread_data.hpp
11
+ @@ -57,7 +57,7 @@ namespace boost
12
+ #else
13
+ std::size_t page_size = ::sysconf( _SC_PAGESIZE);
14
+ #endif
15
+ - #if PTHREAD_STACK_MIN > 0
16
+ + #ifdef PTHREAD_STACK_MIN
17
+ if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
18
+ #endif
19
+ size = ((size+page_size-1)/page_size)*page_size;
You can’t perform that action at this time.
0 commit comments