Skip to content

[protobuf] fix protobuf-3.18 mingw build failure #22369

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

Merged
strega-nil-ms merged 2 commits into from
Jan 12, 2022
Merged

[protobuf] fix protobuf-3.18 mingw build failure #22369

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
cb65957
fix protobuf-3.18 mingw build
fairlyblank Jan 5, 2022
9aadf8d
fix protobuf-3.18 mingw build
fairlyblank Jan 6, 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
11 changes: 11 additions & 0 deletions ports/protobuf/fix-mingw-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/google/protobuf/io/zero_copy_stream_impl.cc 2021-09-15 00:48:28.000000000 +0800
+++ b/src/google/protobuf/io/zero_copy_stream_impl.cc 2022-01-06 15:19:12.657413400 +0800
@@ -104,7 +104,7 @@
is_closed_(false),
errno_(0),
previous_seek_failed_(false) {
-#ifndef _MSC_VER
+#ifndef _WIN32
int flags = fcntl(file_, F_GETFL);
flags &= ~O_NONBLOCK;
fcntl(file_, F_SETFL, flags);
1 change: 1 addition & 0 deletions ports/protobuf/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_from_github(
fix-static-build.patch
fix-default-proto-file-path.patch
fix-uwp-build.patch
fix-mingw-build.patch
)

string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES)
Expand Down
1 change: 1 addition & 0 deletions ports/protobuf/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "protobuf",
"version-semver": "3.18.0",
"port-version": 1,
"description": "Protocol Buffers - Google's data interchange format",
"homepage": "https://github.com/protocolbuffers/protobuf",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5442,7 +5442,7 @@
},
"protobuf": {
"baseline": "3.18.0",
"port-version": 0
"port-version": 1
},
"protobuf-c": {
"baseline": "1.4.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/protobuf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611",
"version-semver": "3.18.0",
"port-version": 1
},
{
"git-tree": "19c2bf45c235e6126161bae36aa7ff7e1fcda479",
"version-semver": "3.18.0",
Expand Down