improve proto to support win arm (#1580)

* improve proto to support win arm

* fix patch
pull/1586/head
ruki 2 years ago committed by GitHub
parent eb1f91f5da
commit b993d29d78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 23
      packages/p/protobuf-c/patches/1.3.1/342.patch
  2. 5
      packages/p/protobuf-c/xmake.lua
  3. 3
      packages/p/protobuf-cpp/xmake.lua

@ -0,0 +1,23 @@
From 080724364a5aad61728f8eba57677467bf329088 Mon Sep 17 00:00:00 2001
From: storyun <joowoni91@gmail.com>
Date: Wed, 19 Sep 2018 11:34:48 +0900
Subject: [PATCH] Invalid namespace
google::protobuf::message::Reflaction is not exist namespace.
---
t/generated-code2/cxx-generate-packed-data.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/generated-code2/cxx-generate-packed-data.cc b/t/generated-code2/cxx-generate-packed-data.cc
index 4fd3e252..0865d2e4 100644
--- a/t/generated-code2/cxx-generate-packed-data.cc
+++ b/t/generated-code2/cxx-generate-packed-data.cc
@@ -998,7 +998,7 @@ static void dump_test_packed_repeated_enum (void)
static void dump_test_unknown_fields (void)
{
EmptyMess mess;
- const google::protobuf::Message::Reflection *reflection = mess.GetReflection();
+ const google::protobuf::Reflection *reflection = mess.GetReflection();
google::protobuf::UnknownFieldSet *fs = reflection->MutableUnknownFields(&mess);
#if GOOGLE_PROTOBUF_VERSION >= 2001000

@ -9,7 +9,7 @@ package("protobuf-c")
-- fix "error: no type named 'Reflection' in 'google::protobuf::Message'"
-- see https://github.com/protobuf-c/protobuf-c/pull/342
-- and https://github.com/protobuf-c/protobuf-c/issues/356
add_patches("1.3.1", "https://github.com/protobuf-c/protobuf-c/pull/342.patch", "050306bae86af55f90606613d3c362c3c93af779aa6be3e639c6a1df3c228c87")
add_patches("1.3.1", path.join(os.scriptdir(), "patches", "1.3.1", "342.patch"), "ab78f9eeff2840cacf5b6b143d284e50e43166ec2cbfa78cd47fd8db1e387c6d")
add_deps("protobuf-cpp")
if is_plat("windows") then
@ -64,6 +64,9 @@ package("protobuf-c")
end)
on_test(function (package)
if package:is_cross() then
return
end
io.writefile("test.proto", [[
syntax = "proto3";
package test;

@ -62,6 +62,9 @@ package("protobuf-cpp")
end)
on_test(function (package)
if package:is_cross() then
return
end
io.writefile("test.proto", [[
syntax = "proto3";
package test;

Loading…
Cancel
Save