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

* fix protobuf-3.18 mingw build

* fix protobuf-3.18 mingw build
This commit is contained in:
Liu Chenxin 2022-01-13 03:34:24 +08:00 committed by GitHub
parent b13e043b70
commit e16a8ac6dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 1 deletions

View File

@ -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);

View File

@ -8,6 +8,7 @@ vcpkg_from_github(
fix-static-build.patch fix-static-build.patch
fix-default-proto-file-path.patch fix-default-proto-file-path.patch
fix-uwp-build.patch fix-uwp-build.patch
fix-mingw-build.patch
) )
string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES) string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES)

View File

@ -1,6 +1,7 @@
{ {
"name": "protobuf", "name": "protobuf",
"version-semver": "3.18.0", "version-semver": "3.18.0",
"port-version": 1,
"description": "Protocol Buffers - Google's data interchange format", "description": "Protocol Buffers - Google's data interchange format",
"homepage": "https://github.com/protocolbuffers/protobuf", "homepage": "https://github.com/protocolbuffers/protobuf",
"dependencies": [ "dependencies": [

View File

@ -5446,7 +5446,7 @@
}, },
"protobuf": { "protobuf": {
"baseline": "3.18.0", "baseline": "3.18.0",
"port-version": 0 "port-version": 1
}, },
"protobuf-c": { "protobuf-c": {
"baseline": "1.4.0", "baseline": "1.4.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611",
"version-semver": "3.18.0",
"port-version": 1
},
{ {
"git-tree": "19c2bf45c235e6126161bae36aa7ff7e1fcda479", "git-tree": "19c2bf45c235e6126161bae36aa7ff7e1fcda479",
"version-semver": "3.18.0", "version-semver": "3.18.0",