Quellcode durchsuchen

update abseil to 20230802.1 (#2884)

* update abseil to 20230802.1

* add patch

* add patch

* Update xmake.lua

* Update xmake.lua

* Update 20230802.1-0001-fix-mingw.patch

* Update 20230802.1-0001-fix-mingw.patch

* Update xmake.lua

* Delete packages/a/abseil/patches/20230802.1-0001-fix-mingw.patch

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

---------

Co-authored-by: Your Name <[email protected]>
xpxz vor 1 Jahr
Ursprung
Commit
2e7c8e14b0
1 geänderte Dateien mit 16 neuen und 21 gelöschten Zeilen
  1. 16 21
      packages/a/abseil/xmake.lua

+ 16 - 21
packages/a/abseil/xmake.lua

@@ -12,30 +12,21 @@ package("abseil")
     add_versions("20211102.0", "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4")
     add_versions("20220623.0", "4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602")
     add_versions("20230125.2", "9a2b5752d7bfade0bdeee2701de17c9480620f8b237e1964c1b9967c75374906")
+    add_versions("20230802.1", "987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed")
 
     add_deps("cmake")
 
-    add_links(
-        "absl_status", "absl_cord",
-        "absl_flags", "absl_flags_parse", "absl_flags_internal", "absl_flags_reflection", "absl_flags_marshalling",
-        "absl_flags_commandlineflag_internal", "absl_synchronization", "absl_time", "absl_hash", "absl_city", "absl_time_zone",
-        "absl_spinlock_wait", "absl_failure_signal_handler", "absl_bad_optional_access", "absl_flags_commandlineflag",
-        "absl_random_internal_pool_urbg",
-        "absl_cordz_info", "absl_cord_internal", "absl_cordz_functions", "absl_cordz_handle", "absl_cordz_sample_token",
-        "absl_base", "absl_bad_any_cast_impl", "absl_periodic_sampler", "absl_random_distributions",
-        "absl_flags_usage_internal", "absl_random_seed_sequences",
-        "absl_throw_delegate", "absl_stacktrace", "absl_symbolize", "absl_debugging_internal",
-        "absl_flags_private_handle_accessor",
-        "absl_strings", "absl_flags_config", "absl_malloc_internal", "absl_str_format_internal",
-        "absl_flags_usage", "absl_strings_internal", "absl_flags_program_name", "absl_int128",
-        "absl_scoped_set_env", "absl_raw_hash_set", "absl_random_internal_seed_material",
-        "absl_random_internal_randen", "absl_random_internal_randen_slow", "absl_random_internal_randen_hwaes_impl",
-        "absl_random_internal_randen_hwaes",
-        "absl_graphcycles_internal", "absl_exponential_biased", "absl_bad_variant_access", "absl_statusor",
-        "absl_random_internal_distribution_test_util", "absl_random_internal_platform",
-        "absl_hashtablez_sampler", "absl_demangle_internal", "absl_leak_check", "absl_log_severity", "absl_raw_logging_internal",
-        "absl_strerror", "absl_examine_stack", "absl_low_level_hash", "absl_random_seed_gen_exception", "absl_civil_time",
-        "absl_crc_cord_state", "absl_crc32c", "absl_crc_cpu_detect", "absl_crc_internal")
+    add_linkorders("absl_strings", "absl_base")
+    add_linkorders("absl_strings_internal", "absl_base")
+    add_linkorders("absl_str_format_internal", "absl_base")
+    add_linkorders("absl_flags", "absl_base")
+    add_linkorders("absl_synchronization", "absl_base")
+    add_linkorders("absl_hash", "absl_base")
+    add_linkorders("absl_city", "absl_base")
+    add_linkorders("absl_time", "absl_base")
+    add_linkorders("absl_strings", "absl_raw_logging_internal")
+    add_linkorders("absl_strings_internal", "absl_raw_logging_internal")
+    add_linkorders("absl_str_format_internal", "absl_raw_logging_internal")
 
     if is_plat("macosx") then
         add_frameworks("CoreFoundation")
@@ -49,6 +40,10 @@ package("abseil")
     end)
 
     on_install("macosx", "linux", "windows", "mingw", "cross", function (package)
+        if package:version():eq("20230802.1") and package:is_plat("mingw") then
+            io.replace(path.join("absl", "synchronization", "internal", "pthread_waiter.h"), "#ifndef _WIN32", "#if !defined(_WIN32) && !defined(__MINGW32__)", {plain = true})
+            io.replace(path.join("absl", "synchronization", "internal", "win32_waiter.h"), "#if defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_VISTA", "#if defined(_WIN32) && !defined(__MINGW32__) && _WIN32_WINNT >= _WIN32_WINNT_VISTA", {plain = true})
+        end
         local configs = {"-DCMAKE_CXX_STANDARD=17"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))