3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 05:08:02 +08:00
Code Issues Projects Releases Wiki Activity

[protobuf] Protobuf no longer compiles with vs2019 Update 16.10 w/ c++latest (#18251)

Browse Source 
* Create port_def.patch

Patch to turn off constinit with Visual Studio 2019 Update 16.10

* Update portfile.cmake

Apply port_def.patch

* Update vcpkg.json

Increment port-version

* Add version
This commit is contained in:
Max Golovanov 2021-06-10 16:32:11 -07:00 committed by GitHub
parent 761578f827
commit 7d472dd258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/protobuf/port_def.patch Normal file
View File

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

1
ports/protobuf/portfile.cmake
View File

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

2
ports/protobuf/vcpkg.json
View File

@ -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": [

2
versions/baseline.json
View File

@ -4974,7 +4974,7 @@
},
"protobuf": {
"baseline": "3.15.8",
"port-version": 1
"port-version": 2
},
"protobuf-c": {
"baseline": "1.3.2-2",

5
versions/p-/protobuf.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1c52c3eb43c2dfd9603673eb5c173ec69c21ea73",
"version-semver": "3.15.8",
"port-version": 2
},
{
"git-tree": "04dc7ffb4ebb123e734652cdb359ff18dca83ffc",
"version-semver": "3.15.8",