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 protobuf423 #48

Merged
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
24 changes: 18 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml

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

14 changes: 10 additions & 4 deletions .azure-pipelines/azure-pipelines-osx.yml

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

7 changes: 5 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml

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

25 changes: 25 additions & 0 deletions .ci_support/linux_64_libgrpc1.55libprotobuf4.23.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcurl:
- '8'
libgrpc:
- '1.55'
libprotobuf:
- '4.23'
target_platform:
- linux-64
zip_keys:
- - libgrpc
- libprotobuf
zlib:
- '1.2'
29 changes: 29 additions & 0 deletions .ci_support/linux_aarch64_libgrpc1.55libprotobuf4.23.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
cdt_arch:
- aarch64
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcurl:
- '8'
libgrpc:
- '1.55'
libprotobuf:
- '4.23'
target_platform:
- linux-aarch64
zip_keys:
- - libgrpc
- libprotobuf
zlib:
- '1.2'
25 changes: 25 additions & 0 deletions .ci_support/linux_ppc64le_libgrpc1.55libprotobuf4.23.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcurl:
- '8'
libgrpc:
- '1.55'
libprotobuf:
- '4.23'
target_platform:
- linux-ppc64le
zip_keys:
- - libgrpc
- libprotobuf
zlib:
- '1.2'
11 changes: 11 additions & 0 deletions .ci_support/migrations/protobuf423.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
__migrator:
build_number: 1
kind: version
migration_number: 1
libgrpc:
- '1.54'
- '1.55'
libprotobuf:
- '3.21'
- '4.23'
migrator_ts: 1684932016.2362208
25 changes: 25 additions & 0 deletions .ci_support/osx_64_libgrpc1.55libprotobuf4.23.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
libcurl:
- '8'
libgrpc:
- '1.55'
libprotobuf:
- '4.23'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
- osx-64
zip_keys:
- - libgrpc
- libprotobuf
zlib:
- '1.2'
25 changes: 25 additions & 0 deletions .ci_support/osx_arm64_libgrpc1.55libprotobuf4.23.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
libcurl:
- '8'
libgrpc:
- '1.55'
libprotobuf:
- '4.23'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
- osx-arm64
zip_keys:
- - libgrpc
- libprotobuf
zlib:
- '1.2'
27 changes: 27 additions & 0 deletions .ci_support/win_64_libgrpc1.55libprotobuf4.23.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
c_ares:
- '1'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libabseil:
- '20230125'
libcurl:
- '8'
libgrpc:
- '1.55'
libprotobuf:
- '4.23'
openssl:
- '3'
re2:
- 2023.03.02
target_platform:
- win-64
zip_keys:
- - libgrpc
- libprotobuf
zlib:
- '1.2'
66 changes: 54 additions & 12 deletions README.md

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

5 changes: 3 additions & 2 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@ cmake -GNinja ^
-DBUILD_SHARED_LIBS=ON ^
-DBUILD_TESTING=OFF ^
-DOPENTELEMETRY_INSTALL=ON ^
-DWITH_ABSEIL=ON ^
-DWITH_API_ONLY=OFF ^
-DWITH_BENCHMARK=OFF ^
-DWITH_ETW=ON ^
-DWITH_EXAMPLES=OFF ^
-DWITH_METRICS_PREVIEW=ON ^
-DWITH_OTLP=ON ^
-DWITH_OTLP_GRPC=ON ^
-DWITH_OTLP_HTTP=ON ^
-DWITH_ZIPKIN=ON ^
-DWITH_METRICS_PREVIEW=ON ^
-DWITH_PROMETHEUS=ON ^
-DWITH_ZIPKIN=ON ^
..
if %ERRORLEVEL% neq 0 exit 1

Expand Down
11 changes: 10 additions & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == 1 ]]; then
PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc
fi

if [[ "${target_platform}" == osx-* ]]; then
# See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
# protobuf switches definitions based on presence of this symbol, for details see
# https://github.com/protocolbuffers/protobuf/issues/12746#issuecomment-1546736962
CXXFLAGS="${CXXFLAGS} -DPROTOBUF_USE_DLLS"
fi

cmake -GNinja \
${CMAKE_ARGS} \
-DCMAKE_BUILD_TYPE=Release \
Expand All @@ -25,6 +33,7 @@ cmake -GNinja \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_TESTING=OFF \
-DOPENTELEMETRY_INSTALL=ON \
-DWITH_ABSEIL=ON \
-DWITH_API_ONLY=OFF \
-DWITH_BENCHMARK=OFF \
-DWITH_EXAMPLES=OFF \
Expand All @@ -33,8 +42,8 @@ cmake -GNinja \
-DWITH_OTLP_GRPC=ON \
-DWITH_OTLP_HTTP=ON \
-DWITH_PROMETHEUS=ON \
-DProtobuf_PROTOC_EXECUTABLE=$PROTOC_EXECUTABLE \
-DWITH_ZIPKIN=ON \
-DProtobuf_PROTOC_EXECUTABLE=$PROTOC_EXECUTABLE \
..

cmake --build .
Loading