Skip to content

Commit

Permalink
Fix pin on boost headers (#55)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] committed Dec 30, 2023
2 parents b43d5cb + 43dd4e5 commit 0ea6d72
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 25 deletions.
2 changes: 2 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gmp:
- '6'
libboost_devel:
- '1.82'
libflint:
- '3.0'
pin_run_as_build:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gmp:
- '6'
libboost_devel:
- '1.82'
libflint:
- '3.0'
target_platform:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gmp:
- '6'
libboost_devel:
- '1.82'
libflint:
- '3.0'
target_platform:
Expand Down
21 changes: 0 additions & 21 deletions .ci_support/migrations/boost_cpp_to_libboost.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ cxx_compiler_version:
- '14'
gmp:
- '6'
libboost_devel:
- '1.82'
libflint:
- '3.0'
macos_machine:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ cxx_compiler_version:
- '14'
gmp:
- '6'
libboost_devel:
- '1.82'
libflint:
- '3.0'
macos_machine:
Expand Down
14 changes: 12 additions & 2 deletions .gitignore

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

14 changes: 12 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source:
sha256: a38d2ab62c1b00fa2ee78f39039cc4d9d8e83de5fa5e2a18529ad34ab8976fe1

build:
number: 0
number: 1
# Upstream doesn't support MSVC yet.
skip: true # [win]

Expand All @@ -29,7 +29,12 @@ outputs:
- gnuconfig # [unix]
- {{ compiler('cxx') }}
host:
- libboost-headers
# We only need the libboost-headers at compile time. However, since we
# use bits of boost in our API, code built against libeantic must be
# built with a compatible version of the headers. Therefore, we add a
# liboost pin to our run exports so libboost-headers are going to be
# in a compatible version.
- libboost-devel
- gmp # [unix]
- mpir # [win]
- libflint
Expand Down Expand Up @@ -59,6 +64,8 @@ outputs:
- gnuconfig # [unix]
- {{ compiler('cxx') }}
host:
# Note that the libboost-devel from libeantic forces these headers to be
# compatible with ones used when building libeantic.
- libboost-headers
- python
- cppyy
Expand All @@ -72,6 +79,9 @@ outputs:
- cppyy
- cppyythonizations
- gmpxxyy
# cppyy dynamically compiles C++ wrappers at runtime, therefore we need C++ headers of boost.
# Note that the libboost-devel from libeantic forces these headers to be
# compatible with ones used when building libeantic.
- libboost-headers
# A subpackage does not see the run_exports of another subpackage:
# https://github.com/conda/conda-build/issues/3478
Expand Down

0 comments on commit 0ea6d72

Please sign in to comment.