Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boost v1.85.0 #196

Merged
merged 7 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
bzip2:
- '1'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand Down Expand Up @@ -44,6 +48,8 @@ target_platform:
xz:
- '5'
zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- numpy
- python_impl
Expand Down
6 changes: 6 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ BUILD:
- aarch64-conda_cos7-linux-gnu
bzip2:
- '1'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand Down Expand Up @@ -48,6 +52,8 @@ target_platform:
xz:
- '5'
zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- numpy
- python_impl
Expand Down
6 changes: 6 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
bzip2:
- '1'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand Down Expand Up @@ -44,6 +48,8 @@ target_platform:
xz:
- '5'
zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- numpy
- python_impl
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET:
- '10.13'
bzip2:
- '1'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET:
- '11.0'
bzip2:
- '1'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
bzip2:
- '1'
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand Down
6 changes: 3 additions & 3 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions azure-pipelines.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,4 @@ provider:
linux_aarch64: default
linux_ppc64le: default
win: azure
remote_ci_setup:
- conda-forge-ci-setup=4
# breakage due to (most likely) https://github.com/conda/conda-build/issues/5179
- conda-build<3.28
test: native_and_emulated
2 changes: 1 addition & 1 deletion recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Bump MacOs target to 10.13 for Boost.Cobalt / C++20 support
MACOSX_DEPLOYMENT_TARGET:
c_stdlib_version: # [osx and x86_64]
- '10.13' # [osx and x86_64]
14 changes: 8 additions & 6 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "1.84.0" %}
{% set version = "1.85.0" %}

{% set boost_libs = [
"atomic", "chrono", "cobalt", "container", "context", "contract", "coroutine",
Expand All @@ -22,21 +22,23 @@ package:

source:
url: https://boostorg.jfrog.io/artifactory/main/release/{{ version }}/source/boost_{{ version|replace(".", "_") }}.tar.bz2
sha256: cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454
sha256: 7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617
patches:
# ensure our compiler flags get used during bootstrapping
- patches/0001-Add-default-value-for-cxx-and-cxxflags-options-for-t.patch
- patches/0002-Reimplement-string_set-as-any_string.patch
# backport https://github.com/boostorg/charconv/pull/183
- patches/0001-Merge-pull-request-183-from-boostorg-ppc64le.patch

build:
number: 2
number: 0
script_env:
- PY_DUMMY_VER={{ PY_DUMMY_VER }}
- NP_DUMMY_VER={{ NP_DUMMY_VER }}

requirements:
build:
- {{ compiler('cxx') }}
- {{ stdlib('c') }}
- cross-python_{{ target_platform }} # [build_platform != target_platform]
- python {{ PY_DUMMY_VER }}.* *_cpython # [build_platform != target_platform]
- numpy {{ NP_DUMMY_VER }}.* # [build_platform != target_platform]
Expand Down Expand Up @@ -99,15 +101,14 @@ outputs:
build:
# for strong run-exports
- {{ compiler('cxx') }}
- {{ stdlib('c') }}
host:
- icu # [unix]
- libiconv # [win]
- bzip2
- xz
- zlib
- zstd
run:
- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64]
run_constrained:
# Anaconda's output is also called libboost; therefore we automatically
# avoid issues of co-installability, because a package with the same name
Expand Down Expand Up @@ -234,6 +235,7 @@ outputs:
- cross-python_{{ target_platform }} # [build_platform != target_platform]
- numpy # [build_platform != target_platform]
- {{ compiler('cxx') }}
- {{ stdlib('c') }}
host:
# ensure python_impl gets picked up by smithy (by using it as a selector) and therefore
# populated in the .ci_config/*.yaml files, for use in {build,install}-py.{sh,bat}.
Expand Down
Loading