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

Rebuild for libabseil20230802 #171

Merged
merged 3 commits into from
Aug 11, 2023
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
2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
jsoncpp:
- 1.9.5
libabseil:
- '20230125'
- '20230802'
target_platform:
- linux-64
zip_keys:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
jsoncpp:
- 1.9.5
libabseil:
- '20230125'
- '20230802'
target_platform:
- linux-aarch64
zip_keys:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
jsoncpp:
- 1.9.5
libabseil:
- '20230125'
- '20230802'
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
6 changes: 4 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
Expand All @@ -15,7 +17,7 @@ cxx_compiler_version:
jsoncpp:
- 1.9.5
libabseil:
- '20230125'
- '20230802'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
jsoncpp:
- 1.9.5
libabseil:
- '20230125'
- '20230802'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
jsoncpp:
- 1.9.5
libabseil:
- '20230125'
- '20230802'
target_platform:
- win-64
zlib:
Expand Down
9 changes: 9 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# abseil 20230802 now only support MacOS >=10.13, reflect this here
MACOSX_SDK_VERSION: # [osx and x86_64]
- "10.13" # [osx and x86_64]
MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64]
- "10.13" # [osx and x86_64]

# manual pin because we're linking migrations
libabseil:
- 20230802
3 changes: 2 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ source:
- patches/0006-do-not-install-vendored-gmock.patch

build:
number: 1
number: 2

outputs:
- name: libprotobuf
Expand Down Expand Up @@ -53,6 +53,7 @@ outputs:
- zlib
run:
- ucrt # [win]
- __osx >={{ MACOSX_DEPLOYMENT_TARGET }} # [osx and x86_64]
test:
requires:
# cmake needs compiler to be able to run package detection, see
Expand Down