Skip to content

Commit

Permalink
(conan-io#17471) Add Boost 1.82.0
Browse files Browse the repository at this point in the history
* Add Boost 1.82.0

* boost: add patch for libiconv flag

---------

Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
  • Loading branch information
2 people authored and pezy committed Jul 15, 2023
1 parent 79bf4bd commit 99ec587
Show file tree
Hide file tree
Showing 4 changed files with 303 additions and 0 deletions.
9 changes: 9 additions & 0 deletions recipes/boost/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
sources:
"1.82.0":
url:
- "https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2"
- "https://sourceforge.net/projects/boost/files/boost/1.82.0/boost_1_82_0.tar.bz2"
sha256: a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6
"1.81.0":
url:
- "https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2"
Expand Down Expand Up @@ -53,6 +58,10 @@ sources:
url: "https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2"
sha256: "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee"
patches:
"1.82.0":
- patch_file: "patches/1.82.0-locale-iconv-library-option.patch"
patch_description: "Optional flag to specify iconv from either libc of libiconv"
patch_type: "conan"
"1.81.0":
- patch_file: "patches/boost_1_77_mpi_check.patch"
patch_description: "Fails the build when mpi is not configured"
Expand Down
280 changes: 280 additions & 0 deletions recipes/boost/all/dependencies/dependencies-1.82.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
- url
- wave
dependencies:
atomic: []
chrono:
- system
container: []
context: []
contract:
- exception
- thread
coroutine:
- context
- exception
- system
date_time: []
exception: []
fiber:
- context
- filesystem
fiber_numa:
- fiber
filesystem:
- atomic
- system
graph:
- math
- random
- regex
- serialization
graph_parallel:
- filesystem
- graph
- mpi
- random
- serialization
iostreams:
- random
- regex
json:
- container
- system
locale:
- thread
log:
- atomic
- container
- date_time
- exception
- filesystem
- random
- regex
- system
- thread
log_setup:
- log
math: []
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:
- 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
url:
- system
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
url:
- boost_url
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.82.0
12 changes: 12 additions & 0 deletions recipes/boost/all/patches/1.82.0-locale-iconv-library-option.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2
index f1321db3..36899cdc 100644
--- a/libs/locale/build/Jamfile.v2
+++ b/libs/locale/build/Jamfile.v2
@@ -22,6 +22,7 @@ project /boost/locale
# Features

feature.feature boost.locale.iconv : on off : optional propagated ;
+feature.feature boost.locale.iconv.lib : libc libiconv : optional propagated ;
feature.feature boost.locale.icu : on off : optional propagated ;
feature.feature boost.locale.posix : on off : optional propagated ;
feature.feature boost.locale.std : on off : optional propagated ;
2 changes: 2 additions & 0 deletions recipes/boost/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.82.0":
folder: all
"1.81.0":
folder: all
"1.80.0":
Expand Down

0 comments on commit 99ec587

Please sign in to comment.