Browse Source

update protobuf-c (#3786)

* Update xmake.lua

* pin protobuf-cpp ver

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua
c8ef 1 year ago
parent
commit
182067e6f0
1 changed files with 25 additions and 24 deletions
  1. 25 24
      packages/p/protobuf-c/xmake.lua

+ 25 - 24
packages/p/protobuf-c/xmake.lua

@@ -4,6 +4,7 @@ package("protobuf-c")
     set_description("Google's data interchange format for c")
 
     add_urls("https://github.com/protobuf-c/protobuf-c/releases/download/v$(version)/protobuf-c-$(version).tar.gz")
+    add_versions("1.5.0", "7b404c63361ed35b3667aec75cc37b54298d56dd2bcf369de3373212cc06fd98")
     add_versions("1.3.1", "51472d3a191d6d7b425e32b612e477c06f73fe23e07f6a6a839b11808e9d2267")
 
     -- fix "error: no type named 'Reflection' in 'google::protobuf::Message'"
@@ -11,9 +12,9 @@ package("protobuf-c")
     -- and https://github.com/protobuf-c/protobuf-c/issues/356
     add_patches("1.3.1", path.join(os.scriptdir(), "patches", "1.3.1", "342.patch"), "ab78f9eeff2840cacf5b6b143d284e50e43166ec2cbfa78cd47fd8db1e387c6d")
 
-    add_deps("protobuf-cpp")
+    add_deps("protobuf-cpp 3.19.4")
     if is_plat("windows") then
-        add_deps("cmake")
+        add_deps("cmake", "abseil", "utf8_range")
     end
 
     add_links("protobuf-c")
@@ -25,28 +26,28 @@ package("protobuf-c")
         package:addenv("PATH", "bin")
     end)
 
-    on_install("windows", function (package)
-        -- fix run `protoc-c.exe` failed
-        io.replace("protoc-c/main.cc", "invocation_basename == legacy_name", "1")
-        os.cd("build-cmake")
-        local cflags
-        local shflags
-        local configs = {}
-        if package:config("shared") then
-            table.insert(configs, "-DBUILD_SHARED_LIBS=ON")
-            cflags = {"-DPROTOBUF_C_USE_SHARED_LIB", "-DPROTOBUF_C_EXPORT"}
-            shflags = "/export:protobuf_c_empty_string"
-        else
-            table.insert(configs, "-DBUILD_SHARED_LIBS=OFF")
-        end
-        if package:config("vs_runtime"):startswith("MT") then
-            table.insert(configs, "-DMSVC_STATIC_BUILD=ON")
-        else
-            table.insert(configs, "-DMSVC_STATIC_BUILD=OFF")
-        end
-        import("package.tools.cmake").install(package, configs, {cflags = cflags, shflags = shflags})
-        os.cp("build_*/Release/protoc-gen-c.exe", path.join(package:installdir("bin"), "protoc-c.exe"))
-    end)
+    -- on_install("windows", function (package)
+    --     -- fix run `protoc-c.exe` failed
+    --     io.replace("protoc-c/main.cc", "invocation_basename == legacy_name", "1")
+    --     os.cd("build-cmake")
+    --     local cflags
+    --     local shflags
+    --     local configs = {}
+    --     if package:config("shared") then
+    --         table.insert(configs, "-DBUILD_SHARED_LIBS=ON")
+    --         cflags = {"-DPROTOBUF_C_USE_SHARED_LIB", "-DPROTOBUF_C_EXPORT"}
+    --         shflags = "/export:protobuf_c_empty_string"
+    --     else
+    --         table.insert(configs, "-DBUILD_SHARED_LIBS=OFF")
+    --     end
+    --     if package:config("vs_runtime"):startswith("MT") then
+    --         table.insert(configs, "-DMSVC_STATIC_BUILD=ON")
+    --     else
+    --         table.insert(configs, "-DMSVC_STATIC_BUILD=OFF")
+    --     end
+    --     import("package.tools.cmake").install(package, configs, {cflags = cflags, shflags = shflags})
+    --     os.cp("build_*/Release/protoc-gen-c.exe", path.join(package:installdir("bin"), "protoc-c.exe"))
+    -- end)
 
     on_install("linux", "macosx", function (package)
         local configs = {}