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.

Sign up for GitHub

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

Tighten co-installability of new builds #42

Merged
merged 2 commits into from
Aug 31, 2022
Merged

Tighten co-installability of new builds #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d799631
add run-constraint between libabseil & libabseil-static
h-vetinari Aug 31, 2022
1db8700
MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and co…
h-vetinari Aug 31, 2022
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
4 changes: 2 additions & 2 deletions .ci_support/osx_64_cxx_standard11shared_libsOFF.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
cxx_standard:
- '11'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_cxx_standard14shared_libsOFF.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
cxx_standard:
- '14'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_cxx_standard17shared_libsOFF.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
cxx_standard:
- '17'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_cxx_standard17shared_libsON.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
cxx_standard:
- '17'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_cxx_standard11shared_libsOFF.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
cxx_standard:
- '11'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_cxx_standard14shared_libsOFF.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
cxx_standard:
- '14'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_cxx_standard17shared_libsOFF.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
cxx_standard:
- '17'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_cxx_standard17shared_libsON.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
cxx_standard:
- '17'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cxx_standard11shared_libsOFF.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2017
- vs2019
cxx_standard:
- '11'
shared_libs:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cxx_standard14shared_libsOFF.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2017
- vs2019
cxx_standard:
- '14'
shared_libs:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cxx_standard17shared_libsOFF.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2017
- vs2019
cxx_standard:
- '17'
shared_libs:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cxx_standard17shared_libsON.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2017
- vs2019
cxx_standard:
- '17'
shared_libs:
Expand Down
4 changes: 3 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ source:
- patches/0006-avoid-building-static-libs-on-windows-when-BUILD_SHA.patch

build:
number: 1
number: 2

outputs:
{% if shared_libs == "ON" %}
Expand All @@ -54,6 +54,7 @@ outputs:
- cmake
- ninja
run_constrained:
- libabseil-static ={{ version }}=cxx{{ cxx_standard }}*
# make sure we don't co-install with old version of old package name
- abseil-cpp ={{ version }}

Expand Down Expand Up @@ -94,6 +95,7 @@ outputs:
- cmake
- ninja
run_constrained:
- libabseil ={{ version }}=cxx{{ cxx_standard }}*
# make sure we don't co-install with old version of old package name
- abseil-cpp ={{ version }}
test:
Expand Down