Explorar o código

try enable folly for windows (#4572)

* update glog

* try enable folly for windows
c8ef hai 1 ano
pai
achega
648456ba23
Modificáronse 2 ficheiros con 7 adicións e 6 borrados
  1. 4 4
      packages/f/folly/xmake.lua
  2. 3 2
      packages/g/glog/xmake.lua

+ 4 - 4
packages/f/folly/xmake.lua

@@ -26,8 +26,8 @@ package("folly")
 
     add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980")
     add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495")
-    add_patches("<=2024.04.01", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674")
-    add_patches("<=2024.04.01", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d")
+    add_patches("<=2024.07.01", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674")
+    add_patches("<=2024.07.01", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d")
 
     if is_plat("windows") then
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
@@ -65,7 +65,7 @@ package("folly")
         end
     end)
 
-    on_install("linux", "macosx", function (package)
+    on_install("windows|x64", "macosx", "linux", function (package)
         local configs = {"-DBUILD_TESTS=OFF",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON",
@@ -80,7 +80,7 @@ package("folly")
         import("package.tools.cmake").install(package, configs)
     end)
 
-    on_test("macosx", function (package)
+    on_test("windows|x64", "macosx", function (package)
         assert(package:check_cxxsnippets({test = [[
             #include <cassert>
             void test() {

+ 3 - 2
packages/g/glog/xmake.lua

@@ -6,10 +6,11 @@ package("glog")
     add_urls("https://github.com/google/glog/archive/refs/tags/$(version).tar.gz",
              "https://github.com/google/glog.git")
 
+    add_versions("v0.7.1", "00e4a87e87b7e7612f519a41e491f16623b12423620006f59f5688bfd8d13b08")
     add_versions("v0.7.0", "375106b5976231b92e66879c1a92ce062923b9ae573c42b56ba28b112ee4cc11")
-    add_versions("v0.4.0", "f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c")
-    add_versions("v0.5.0", "eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5")
     add_versions("v0.6.0", "8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6")
+    add_versions("v0.5.0", "eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5")
+    add_versions("v0.4.0", "f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c")
 
     local configdeps = {gtest = "gtest", gflags = "gflags", unwind = "libunwind"}
     for config, dep in pairs(configdeps) do