diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-25 12:36:50 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-25 12:36:50 -0800 |
| commit | fec269d594723bf605a1d65b0fb05f869d954906 (patch) | |
| tree | dd3ee27ddfdfec61d1cdf1e879ae1094a6a81745 | |
| parent | 9a9c3a8634207c9473f178dcf6c2819f6cb7686f (diff) | |
| download | vcpkg-fec269d594723bf605a1d65b0fb05f869d954906.tar.gz vcpkg-fec269d594723bf605a1d65b0fb05f869d954906.zip | |
[protobuf] Restore removed export required for GRPC. [grpc] Update to 1.7.2
| -rw-r--r-- | ports/grpc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/protobuf/CONTROL | 2 | ||||
| -rw-r--r-- | ports/protobuf/export-ParseGeneratorParameter.patch | 13 | ||||
| -rw-r--r-- | ports/protobuf/portfile.cmake | 4 |
5 files changed, 20 insertions, 5 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index b866586fe..8eb7093e1 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.7.0 +Version: 1.7.2 Build-Depends: zlib, openssl, protobuf, c-ares Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 4b7473105..45126f05f 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.7.0 - SHA512 23427ac1f180ce6d70b039225f26cecbd938655d1e5b726414aee7dfee6e6f301913255cfe0ff326dfb34e206ca6476c389b2fd0db58b284fff30c9757c5e4ac + REF v1.7.2 + SHA512 54cb4165878fb3361cd7a81b631f1b20e991eadd286c0f6020542a8aa464cf30bdd1479dc413b767a1585bdc730e465a64c45e9e805723f38bd54521e1c4f942 HEAD_REF master ) diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index 5bdb879dc..c52a3ce55 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,5 +1,5 @@ Source: protobuf -Version: 3.5.0 +Version: 3.5.0-1 Description: Protocol Buffers - Google's data interchange format Feature: zlib diff --git a/ports/protobuf/export-ParseGeneratorParameter.patch b/ports/protobuf/export-ParseGeneratorParameter.patch new file mode 100644 index 000000000..38b45a4c4 --- /dev/null +++ b/ports/protobuf/export-ParseGeneratorParameter.patch @@ -0,0 +1,13 @@ +diff --git a/src/google/protobuf/compiler/code_generator.h b/src/google/protobuf/compiler/code_generator.h +index 4b1d90b..4c2b3ee 100644 +--- a/src/google/protobuf/compiler/code_generator.h ++++ b/src/google/protobuf/compiler/code_generator.h +@@ -166,7 +166,7 @@ typedef GeneratorContext OutputDirectory; + // "foo=bar,baz,qux=corge" + // parses to the pairs: + // ("foo", "bar"), ("baz", ""), ("qux", "corge") +-void ParseGeneratorParameter( ++LIBPROTOC_EXPORT void ParseGeneratorParameter( + const string&, std::vector<std::pair<string, string> >*); + + } // namespace compiler diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 22421d513..7e0c5c4f8 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -22,7 +22,9 @@ vcpkg_extract_source_archive(${ARCHIVE_FILE}) # Add a flag that can be set to disable the protobuf compiler vcpkg_apply_patches( SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/protobuf-${PROTOBUF_VERSION} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/001-add-compiler-flag.patch" + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/001-add-compiler-flag.patch" + "${CMAKE_CURRENT_LIST_DIR}/export-ParseGeneratorParameter.patch" ) |