diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/protobuf/port_def.patch | 14 | ||||
| -rw-r--r-- | ports/protobuf/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/protobuf/vcpkg.json | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/ports/protobuf/port_def.patch b/ports/protobuf/port_def.patch new file mode 100644 index 000000000..31d71531d --- /dev/null +++ b/ports/protobuf/port_def.patch @@ -0,0 +1,14 @@ +diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc +index f7b64a080..3493d9082 100644 +--- a/src/google/protobuf/port_def.inc ++++ b/src/google/protobuf/port_def.inc +@@ -564,7 +564,8 @@ + + // Our use of constinit does not yet work with GCC: + // https://github.com/protocolbuffers/protobuf/issues/8310 +-#if defined(__cpp_constinit) && !defined(__GNUC__) ++// Does not work yet with Visual Studio 2019 Update 16.10 ++#if defined(__cpp_constinit) && !defined(__GNUC__) && !defined(_MSC_VER) + #define PROTOBUF_CONSTINIT constinit + #elif defined(__has_cpp_attribute) + #if __has_cpp_attribute(clang::require_constant_initialization) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 939e37096..8f7c3b119 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-static-build.patch fix-default-proto-file-path.patch + port_def.patch ) string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 5808add91..5f1926a08 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "protobuf", "version-semver": "3.15.8", - "port-version": 1, + "port-version": 2, "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "dependencies": [ |