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

protobuf v21.6 #163

Merged
merged 3 commits into from
Sep 23, 2022
Merged

protobuf v21.6 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d123b4
updated v21.6
regro-cf-autotick-bot Sep 14, 2022
ce9f886
MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and co…
regro-cf-autotick-bot Sep 14, 2022
0d52e1f
Update patch based on @h-vetinari's suggestion
xylar Sep 17, 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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop

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

1 change: 1 addition & 0 deletions README.md
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# keep this without major version to let the bot pick it up
{% set version = "21.5" %}
{% set version = "21.6" %}
# protobuf doesn't add the major version in the tag...
{% set major = "4" %}
# libprotobuf now has a different major version than protobuf
Expand All @@ -11,14 +11,14 @@ package:

source:
url: https://github.com/protocolbuffers/protobuf/archive/v{{ version }}/protobuf-v{{ version }}.tar.gz
sha256: 4a7e87e4166c358c63342dddcde6312faee06ea9d5bb4e2fa87d3478076f6639
sha256: dbb16fdbca8f277c9a194d9a837395cde408ca136738d94743130dd0de015efd
patches:
- patches/0001-do-not-link-msvc-runtime-statically.patch
- patches/0002-fix-paths-for-include-lib-directories.patch
- patches/0003-adapt-to-name-of-protobuf-lib-on-windows.patch

build:
number: 1
number: 0
script:
- cd python
- {{ PYTHON }} -m pip install . -vv --install-option="--cpp_implementation"
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0003-adapt-to-name-of-protobuf-lib-on-windows.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ index 2b907cf9f..9127f05d2 100755
compile_static_ext = GetOptionFromArgv('--compile_static_extension')
- libraries = ['protobuf']
+ # our windows builds don't follow standard windows naming (i.e. have a lib prefix)
+ libraries = ['protobuf'] if sys.platform != 'win32' else ['libprotobuf']
+ libraries = ['protobuf'] if sys.platform != 'win32' else ['libprotobuf-static']
extra_objects = None
if compile_static_ext:
libraries = None
Expand Down