Skip to content

Commit

Permalink
(#3872) boost: add boost/1.75.0
Browse files Browse the repository at this point in the history
* boost: add boost/1.75.0

* boost: disable json in test_package by default

* boost: fix layout suffix on MSVC

* boost: fix test_package

* boost: fix fix test_package ;)

* boost: json requires c++11 compiler. So don't build on too old compilers or with too old default

* boost: remove unsupported options at end of config_options method

* boost: set version default c++ standard=11 for MSVC and apple-clang

* boost: update compiler versions having c++11 default or higher

* boost: move dlls+pdbs to bin folder + remove pdbs

* boost: iOS needs BOOST_(AC|SP)_USE_PTHREADS

* boost: I don't know what version of compiler supports c++11 of every compiler

* boost: test availability of dependency with correct name

* boost: add locale test

* boost: pass root path of libiconv and icu

* boost: allow static icu dependency (with boost:i18n_backend=icu)

* boost: add nowide option + check fiber/newide

* boost: fix typos + refactor utility function + uncomment -q

Co-authored-by: Ayaz Salikhov <[email protected]>
Co-authored-by: Martin Miralles-Cordal <[email protected]>

* booost: re-enable -q + layout=b2-default is equivalent to versioned on Windows, system on others

* boost: build only MSVC with nowide

* boost: add include <ios>

* boost: re-enable all configurations

Co-authored-by: Ayaz Salikhov <[email protected]>
Co-authored-by: Martin Miralles-Cordal <[email protected]>
  • Loading branch information
3 people authored Dec 23, 2020
1 parent 540b259 commit 165420d
Show file tree
Hide file tree
Showing 13 changed files with 789 additions and 78 deletions.
11 changes: 11 additions & 0 deletions recipes/boost/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ sources:
"https://sourceforge.net/projects/boost/files/boost/1.74.0/boost_1_74_0.tar.bz2"
]
sha256: "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1"
1.75.0:
url: [
"https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2",
"https://sourceforge.net/projects/boost/files/boost/1.75.0/boost_1_75_0.tar.bz2"
]
sha256: "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb"
patches:
1.69.0:
- patch_file: "patches/boost_build_asmflags.patch"
Expand Down Expand Up @@ -93,3 +99,8 @@ patches:
base_path: "source_subfolder"
- patch_file: "patches/python_base_prefix_since_1_74.patch"
base_path: "source_subfolder"
1.75.0:
- patch_file: "patches/boost_build_qcc_fix_debug_build_parameter_since_1_74.patch"
base_path: "source_subfolder"
- patch_file: "patches/python_base_prefix_since_1_74.patch"
base_path: "source_subfolder"
255 changes: 190 additions & 65 deletions recipes/boost/all/conanfile.py

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions recipes/boost/all/dependencies/dependencies-1.73.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ configure_options:
- log
- math
- mpi
- nowide
- program_options
- python
- random
Expand Down
1 change: 1 addition & 0 deletions recipes/boost/all/dependencies/dependencies-1.74.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ configure_options:
- log
- math
- mpi
- nowide
- program_options
- python
- random
Expand Down
280 changes: 280 additions & 0 deletions recipes/boost/all/dependencies/dependencies-1.75.0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,280 @@
configure_options:
- atomic
- chrono
- container
- context
- contract
- coroutine
- date_time
- exception
- fiber
- filesystem
- graph
- graph_parallel
- iostreams
- json
- locale
- log
- math
- mpi
- nowide
- program_options
- python
- random
- regex
- serialization
- stacktrace
- system
- test
- thread
- timer
- type_erasure
- wave
dependencies:
atomic: []
chrono:
- system
container: []
context:
- thread
contract:
- exception
- thread
coroutine:
- context
- exception
- system
- thread
date_time: []
exception: []
fiber:
- context
- filesystem
fiber_numa:
- fiber
filesystem:
- system
graph:
- math
- random
- regex
- serialization
graph_parallel:
- filesystem
- graph
- mpi
- random
- serialization
iostreams:
- random
- regex
json:
- container
- exception
- system
locale:
- thread
log:
- atomic
- container
- date_time
- exception
- filesystem
- locale
- random
- regex
- system
- thread
log_setup:
- log
math:
- atomic
math_c99:
- math
math_c99f:
- math
math_c99l:
- math
math_tr1:
- math
math_tr1f:
- math
math_tr1l:
- math
mpi:
- graph
- serialization
mpi_python:
- mpi
- python
nowide:
- filesystem
numpy:
- python
prg_exec_monitor:
- test
program_options: []
python: []
random:
- math
- system
regex: []
serialization: []
stacktrace: []
stacktrace_addr2line:
- stacktrace
stacktrace_backtrace:
- stacktrace
stacktrace_basic:
- stacktrace
stacktrace_noop:
- stacktrace
stacktrace_windbg:
- stacktrace
stacktrace_windbg_cached:
- stacktrace
system: []
test:
- exception
test_exec_monitor:
- test
thread:
- atomic
- chrono
- container
- date_time
- exception
- system
timer:
- chrono
- system
type_erasure:
- thread
unit_test_framework:
- prg_exec_monitor
- test
- test_exec_monitor
wave:
- filesystem
- serialization
wserialization:
- serialization
libs:
atomic:
- boost_atomic
chrono:
- boost_chrono
container:
- boost_container
context:
- boost_context
contract:
- boost_contract
coroutine:
- boost_coroutine
date_time:
- boost_date_time
exception:
- boost_exception
fiber:
- boost_fiber
fiber_numa:
- boost_fiber_numa
filesystem:
- boost_filesystem
graph:
- boost_graph
graph_parallel:
- boost_graph_parallel
iostreams:
- boost_iostreams
json:
- boost_json
locale:
- boost_locale
log:
- boost_log
log_setup:
- boost_log_setup
math: []
math_c99:
- boost_math_c99
math_c99f:
- boost_math_c99f
math_c99l:
- boost_math_c99l
math_tr1:
- boost_math_tr1
math_tr1f:
- boost_math_tr1f
math_tr1l:
- boost_math_tr1l
mpi:
- boost_mpi
mpi_python:
- boost_mpi_python
nowide:
- boost_nowide
numpy:
- boost_numpy{py_major}{py_minor}
prg_exec_monitor:
- boost_prg_exec_monitor
program_options:
- boost_program_options
python:
- boost_python{py_major}{py_minor}
random:
- boost_random
regex:
- boost_regex
serialization:
- boost_serialization
stacktrace: []
stacktrace_addr2line:
- boost_stacktrace_addr2line
stacktrace_backtrace:
- boost_stacktrace_backtrace
stacktrace_basic:
- boost_stacktrace_basic
stacktrace_noop:
- boost_stacktrace_noop
stacktrace_windbg:
- boost_stacktrace_windbg
stacktrace_windbg_cached:
- boost_stacktrace_windbg_cached
system:
- boost_system
test: []
test_exec_monitor:
- boost_test_exec_monitor
thread:
- boost_thread
timer:
- boost_timer
type_erasure:
- boost_type_erasure
unit_test_framework:
- boost_unit_test_framework
wave:
- boost_wave
wserialization:
- boost_wserialization
requirements:
iostreams:
- bzip2
- lzma
- zlib
- zstd
locale:
- iconv
- icu
python:
- python
regex:
- icu
stacktrace:
- backtrace
static_only:
- boost_exception
- boost_test_exec_monitor
version: 1.75.0
Loading

0 comments on commit 165420d

Please sign in to comment.