On Tue, Jan 31, 2023 at 02:57:45PM +0000, Klemens Nanni wrote: > 30.01.2023 17:27, Klemens Nanni пишет: > > https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 > > > > One diff got merged, the other about disabled PowerPC bits remains, but > > moved code to a new file. > > > > To avoid churn in every update diff, I've folded library handling so > > that only one line changes version and others possibly lose/gain names. > > > > If that seems fine, I'm inclined to do that mechanical move first and > > then commit the update separately so this bump already benefits from it > > as it adds new libraries. > > This proved useful to defer test compilation and thus reduce build time > by more than 50%, so I just committed those bits. > > do-build and do-test now compile 247 and 392 files, respectively. > > > tg_owt and tdesktop build and run fine on amd64. > > > > --- > > 98% tests passed, 4 tests failed out of 203 > > > > Total Test time (real) = 187.86 sec > > > > The following tests FAILED: > > 90 - absl_log_stripping_test (Failed) > > 155 - absl_charconv_test (Failed) > > 163 - absl_str_format_convert_test (Failed) > > 191 - absl_time_test (Failed) > > --- > > > > Feedback? OK? > > With this update, > do-build and do-test now compile 307 and 454 files, respectively.
Rebased after more cleanup and jca's clang 15 fix for tests. Sorry for the noise. Index: Makefile =================================================================== RCS file: /cvs/ports/devel/abseil-cpp/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile 31 Jan 2023 16:10:53 -0000 1.11 +++ Makefile 31 Jan 2023 16:14:08 -0000 @@ -1,9 +1,9 @@ -COMMENT = abseil common libraries (c++) +COMMENT = abseil common libraries (C++) CATEGORIES = devel GH_ACCOUNT = abseil GH_PROJECT = ${GH_ACCOUNT}-cpp -GH_TAGNAME = 20220623.1 +GH_TAGNAME = 20230125.0 HOMEPAGE = https://abseil.io/ @@ -16,15 +16,19 @@ PERMIT_PACKAGE = Yes ABSL_LIBS = \ bad_any_cast_impl bad_optional_access bad_variant_access base city \ civil_time cord cord_internal cordz_functions cordz_handle cordz_info \ - cordz_sample_token debugging_internal demangle_internal examine_stack \ + cordz_sample_token crc32c crc_cord_state crc_cpu_detect crc_internal \ + debugging_internal demangle_internal die_if_null examine_stack \ exponential_biased failure_signal_handler flags flags_commandlineflag \ flags_commandlineflag_internal flags_config flags_internal \ flags_marshalling flags_parse flags_private_handle_accessor \ flags_program_name flags_reflection flags_usage flags_usage_internal \ - graphcycles_internal hash hashtablez_sampler int128 log_severity \ - low_level_hash malloc_internal periodic_sampler random_distributions \ - random_internal_distribution_test_util random_internal_platform \ - random_internal_pool_urbg random_internal_randen \ + graphcycles_internal hash hashtablez_sampler int128 log_entry log_flags \ + log_globals log_initialize log_internal_check_op log_internal_conditions \ + log_internal_format log_internal_globals log_internal_log_sink_set \ + log_internal_message log_internal_nullguard log_internal_proto \ + log_severity log_sink low_level_hash malloc_internal periodic_sampler \ + random_distributions random_internal_distribution_test_util \ + random_internal_platform random_internal_pool_urbg random_internal_randen \ random_internal_randen_hwaes random_internal_randen_hwaes_impl \ random_internal_randen_slow random_internal_seed_material \ random_seed_gen_exception random_seed_sequences raw_hash_set \ @@ -32,7 +36,7 @@ ABSL_LIBS = \ statusor str_format_internal strerror strings strings_internal symbolize \ synchronization throw_delegate time time_zone .for _lib in ${ABSL_LIBS} -SHARED_LIBS += absl_${_lib} 1.0 # 2206.0.0 +SHARED_LIBS += absl_${_lib} 2.0 # 2301.0.0 .endfor # on updates, build with `ALL_TARGET=all' once to pick up new libraries Index: distinfo =================================================================== RCS file: /cvs/ports/devel/abseil-cpp/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 4 Dec 2022 17:23:22 -0000 1.2 +++ distinfo 31 Jan 2023 16:14:08 -0000 @@ -1,2 +1,2 @@ -SHA256 (abseil-cpp-20220623.1.tar.gz) = kayH0wzG15+auXTFGHSnBN6cJkfED2kyWXMpooIhe6g= -SIZE (abseil-cpp-20220623.1.tar.gz) = 1957483 +SHA256 (abseil-cpp-20230125.0.tar.gz) = PqSafZdCG4ioxIoN4WwWBI4Xclx+wPHT6iaDoqda3CE= +SIZE (abseil-cpp-20230125.0.tar.gz) = 2119580 Index: patches/patch-absl_base_internal_unscaledcycleclock_config_h =================================================================== RCS file: patches/patch-absl_base_internal_unscaledcycleclock_config_h diff -N patches/patch-absl_base_internal_unscaledcycleclock_config_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-absl_base_internal_unscaledcycleclock_config_h 31 Jan 2023 16:14:08 -0000 @@ -0,0 +1,16 @@ +Disable the PowerPC counter, because UnscaledCycleClock::Frequency() +is not implemented on OpenBSD. Avoids error in unscaledcycleclock.cc, +#error Must implement UnscaledCycleClock::Frequency() + +Index: absl/base/internal/unscaledcycleclock_config.h +--- absl/base/internal/unscaledcycleclock_config.h.orig ++++ absl/base/internal/unscaledcycleclock_config.h +@@ -21,7 +21,7 @@ + + // The following platforms have an implementation of a hardware counter. + #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ +- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ ++ /* defined(__powerpc__) || defined(__ppc__) || */ defined(__riscv) || \ + defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) + #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 + #else Index: patches/patch-absl_base_internal_unscaledcycleclock_h =================================================================== RCS file: patches/patch-absl_base_internal_unscaledcycleclock_h diff -N patches/patch-absl_base_internal_unscaledcycleclock_h --- patches/patch-absl_base_internal_unscaledcycleclock_h 4 Dec 2022 17:23:22 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -Disable the PowerPC counter, because UnscaledCycleClock::Frequency() -is not implemented on OpenBSD. Avoids error in unscaledcycleclock.cc, -#error Must implement UnscaledCycleClock::Frequency() - -Index: absl/base/internal/unscaledcycleclock.h ---- absl/base/internal/unscaledcycleclock.h.orig -+++ absl/base/internal/unscaledcycleclock.h -@@ -46,7 +46,7 @@ - - // The following platforms have an implementation of a hardware counter. - #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ -- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ -+ /* defined(__powerpc__) || defined(__ppc__) || */ defined(__riscv) || \ - defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 - #else Index: patches/patch-absl_debugging_CMakeLists_txt =================================================================== RCS file: /cvs/ports/devel/abseil-cpp/patches/patch-absl_debugging_CMakeLists_txt,v retrieving revision 1.5 diff -u -p -r1.5 patch-absl_debugging_CMakeLists_txt --- patches/patch-absl_debugging_CMakeLists_txt 31 Jan 2023 15:09:48 -0000 1.5 +++ patches/patch-absl_debugging_CMakeLists_txt 31 Jan 2023 16:14:08 -0000 @@ -7,7 +7,7 @@ defaults to --exec-only. Index: absl/debugging/CMakeLists.txt --- absl/debugging/CMakeLists.txt.orig +++ absl/debugging/CMakeLists.txt -@@ -75,6 +75,7 @@ absl_cc_library( +@@ -89,6 +89,7 @@ absl_cc_library( PUBLIC ) @@ -15,7 +15,7 @@ Index: absl/debugging/CMakeLists.txt absl_cc_test( NAME symbolize_test -@@ -96,6 +97,7 @@ absl_cc_test( +@@ -110,6 +111,7 @@ absl_cc_test( absl::strings GTest::gmock ) @@ -23,7 +23,7 @@ Index: absl/debugging/CMakeLists.txt # Internal-only target, do not depend on directly. absl_cc_library( -@@ -206,6 +208,7 @@ absl_cc_test( +@@ -220,6 +222,7 @@ absl_cc_test( GTest::gmock_main ) @@ -31,7 +31,7 @@ Index: absl/debugging/CMakeLists.txt absl_cc_library( NAME leak_check -@@ -235,6 +238,7 @@ absl_cc_test( +@@ -249,6 +252,7 @@ absl_cc_test( absl::base GTest::gmock_main ) @@ -39,7 +39,7 @@ Index: absl/debugging/CMakeLists.txt # Internal-only target, do not depend on directly. absl_cc_library( -@@ -253,6 +257,7 @@ absl_cc_library( +@@ -267,6 +271,7 @@ absl_cc_library( TESTONLY ) @@ -47,7 +47,7 @@ Index: absl/debugging/CMakeLists.txt absl_cc_test( NAME stack_consumption_test -@@ -278,3 +283,4 @@ absl_cc_library( +@@ -292,3 +297,4 @@ absl_cc_library( absl::leak_check PUBLIC ) Index: patches/patch-absl_time_internal_cctz_src_time_zone_format_cc =================================================================== RCS file: patches/patch-absl_time_internal_cctz_src_time_zone_format_cc diff -N patches/patch-absl_time_internal_cctz_src_time_zone_format_cc --- patches/patch-absl_time_internal_cctz_src_time_zone_format_cc 11 Mar 2022 18:49:30 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -Avoid _XOPEN_SOURCE as it breaks build of time_zone_format.cc. - -Index: absl/time/internal/cctz/src/time_zone_format.cc ---- absl/time/internal/cctz/src/time_zone_format.cc.orig -+++ absl/time/internal/cctz/src/time_zone_format.cc -@@ -18,12 +18,6 @@ - #endif - #endif - --#if defined(HAS_STRPTIME) && HAS_STRPTIME --#if !defined(_XOPEN_SOURCE) --#define _XOPEN_SOURCE // Definedness suffices for strptime. --#endif --#endif -- - #include "absl/base/config.h" - #include "absl/time/internal/cctz/include/cctz/time_zone.h" - Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/abseil-cpp/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 4 Dec 2022 17:23:22 -0000 1.3 +++ pkg/PLIST 31 Jan 2023 16:14:09 -0000 @@ -13,6 +13,7 @@ include/absl/base/internal/ include/absl/base/internal/atomic_hook.h include/absl/base/internal/atomic_hook_test_helper.h include/absl/base/internal/cycleclock.h +include/absl/base/internal/cycleclock_config.h include/absl/base/internal/direct_mmap.h include/absl/base/internal/dynamic_annotations.h include/absl/base/internal/endian.h @@ -47,6 +48,7 @@ include/absl/base/internal/throw_delegat include/absl/base/internal/tsan_mutex_interface.h include/absl/base/internal/unaligned_access.h include/absl/base/internal/unscaledcycleclock.h +include/absl/base/internal/unscaledcycleclock_config.h include/absl/base/log_severity.h include/absl/base/macros.h include/absl/base/optimization.h @@ -70,6 +72,7 @@ include/absl/container/internal/ include/absl/container/internal/btree.h include/absl/container/internal/btree_container.h include/absl/container/internal/common.h +include/absl/container/internal/common_policy_traits.h include/absl/container/internal/compressed_tuple.h include/absl/container/internal/container_memory.h include/absl/container/internal/counting_allocator.h @@ -97,6 +100,19 @@ include/absl/container/internal/unordere include/absl/container/internal/unordered_set_modifiers_test.h include/absl/container/node_hash_map.h include/absl/container/node_hash_set.h +include/absl/crc/ +include/absl/crc/crc32c.h +include/absl/crc/internal/ +include/absl/crc/internal/cpu_detect.h +include/absl/crc/internal/crc.h +include/absl/crc/internal/crc32_x86_arm_combined_simd.h +include/absl/crc/internal/crc32c.h +include/absl/crc/internal/crc32c_inline.h +include/absl/crc/internal/crc_cord_state.h +include/absl/crc/internal/crc_internal.h +include/absl/crc/internal/crc_memcpy.h +include/absl/crc/internal/non_temporal_arm_intrinsics.h +include/absl/crc/internal/non_temporal_memcpy.h include/absl/debugging/ include/absl/debugging/failure_signal_handler.h include/absl/debugging/internal/ @@ -162,6 +178,44 @@ include/absl/hash/internal/city.h include/absl/hash/internal/hash.h include/absl/hash/internal/low_level_hash.h include/absl/hash/internal/spy_hash_state.h +include/absl/log/ +include/absl/log/absl_check.h +include/absl/log/absl_log.h +include/absl/log/check.h +include/absl/log/check_test_impl.h +include/absl/log/die_if_null.h +include/absl/log/flags.h +include/absl/log/globals.h +include/absl/log/initialize.h +include/absl/log/internal/ +include/absl/log/internal/append_truncated.h +include/absl/log/internal/check_impl.h +include/absl/log/internal/check_op.h +include/absl/log/internal/conditions.h +include/absl/log/internal/config.h +include/absl/log/internal/flags.h +include/absl/log/internal/globals.h +include/absl/log/internal/log_format.h +include/absl/log/internal/log_impl.h +include/absl/log/internal/log_message.h +include/absl/log/internal/log_sink_set.h +include/absl/log/internal/nullguard.h +include/absl/log/internal/nullstream.h +include/absl/log/internal/proto.h +include/absl/log/internal/strip.h +include/absl/log/internal/structured.h +include/absl/log/internal/test_actions.h +include/absl/log/internal/test_helpers.h +include/absl/log/internal/test_matchers.h +include/absl/log/internal/voidify.h +include/absl/log/log.h +include/absl/log/log_basic_test_impl.h +include/absl/log/log_entry.h +include/absl/log/log_sink.h +include/absl/log/log_sink_registry.h +include/absl/log/log_streamer.h +include/absl/log/scoped_mock_log.h +include/absl/log/structured.h include/absl/memory/ include/absl/memory/memory.h include/absl/meta/ @@ -263,8 +317,10 @@ include/absl/strings/internal/cordz_samp include/absl/strings/internal/cordz_statistics.h include/absl/strings/internal/cordz_update_scope.h include/absl/strings/internal/cordz_update_tracker.h +include/absl/strings/internal/damerau_levenshtein_distance.h include/absl/strings/internal/escaping.h include/absl/strings/internal/escaping_test_common.h +include/absl/strings/internal/has_absl_stringify.h include/absl/strings/internal/memutil.h include/absl/strings/internal/numbers_test_common.h include/absl/strings/internal/ostringstream.h @@ -275,6 +331,7 @@ include/absl/strings/internal/str_format include/absl/strings/internal/str_format/arg.h include/absl/strings/internal/str_format/bind.h include/absl/strings/internal/str_format/checker.h +include/absl/strings/internal/str_format/constexpr_parser.h include/absl/strings/internal/str_format/extension.h include/absl/strings/internal/str_format/float_conversion.h include/absl/strings/internal/str_format/output.h @@ -282,6 +339,7 @@ include/absl/strings/internal/str_format include/absl/strings/internal/str_join_internal.h include/absl/strings/internal/str_split_internal.h include/absl/strings/internal/string_constant.h +include/absl/strings/internal/stringify_sink.h include/absl/strings/internal/utf8.h include/absl/strings/match.h include/absl/strings/numbers.h @@ -328,7 +386,6 @@ include/absl/time/internal/cctz/src/tzfi include/absl/time/internal/get_current_time_chrono.inc include/absl/time/internal/get_current_time_posix.inc include/absl/time/internal/test_util.h -include/absl/time/internal/zoneinfo.inc include/absl/time/time.h include/absl/types/ include/absl/types/any.h @@ -370,8 +427,13 @@ lib/cmake/absl/abslTargets.cmake @lib lib/libabsl_cordz_handle.so.${LIBabsl_cordz_handle_VERSION} @lib lib/libabsl_cordz_info.so.${LIBabsl_cordz_info_VERSION} @lib lib/libabsl_cordz_sample_token.so.${LIBabsl_cordz_sample_token_VERSION} +@lib lib/libabsl_crc32c.so.${LIBabsl_crc32c_VERSION} +@lib lib/libabsl_crc_cord_state.so.${LIBabsl_crc_cord_state_VERSION} +@lib lib/libabsl_crc_cpu_detect.so.${LIBabsl_crc_cpu_detect_VERSION} +@lib lib/libabsl_crc_internal.so.${LIBabsl_crc_internal_VERSION} @lib lib/libabsl_debugging_internal.so.${LIBabsl_debugging_internal_VERSION} @lib lib/libabsl_demangle_internal.so.${LIBabsl_demangle_internal_VERSION} +@lib lib/libabsl_die_if_null.so.${LIBabsl_die_if_null_VERSION} @lib lib/libabsl_examine_stack.so.${LIBabsl_examine_stack_VERSION} @lib lib/libabsl_exponential_biased.so.${LIBabsl_exponential_biased_VERSION} @lib lib/libabsl_failure_signal_handler.so.${LIBabsl_failure_signal_handler_VERSION} @@ -391,7 +453,20 @@ lib/cmake/absl/abslTargets.cmake @lib lib/libabsl_hash.so.${LIBabsl_hash_VERSION} @lib lib/libabsl_hashtablez_sampler.so.${LIBabsl_hashtablez_sampler_VERSION} @lib lib/libabsl_int128.so.${LIBabsl_int128_VERSION} +@lib lib/libabsl_log_entry.so.${LIBabsl_log_entry_VERSION} +@lib lib/libabsl_log_flags.so.${LIBabsl_log_flags_VERSION} +@lib lib/libabsl_log_globals.so.${LIBabsl_log_globals_VERSION} +@lib lib/libabsl_log_initialize.so.${LIBabsl_log_initialize_VERSION} +@lib lib/libabsl_log_internal_check_op.so.${LIBabsl_log_internal_check_op_VERSION} +@lib lib/libabsl_log_internal_conditions.so.${LIBabsl_log_internal_conditions_VERSION} +@lib lib/libabsl_log_internal_format.so.${LIBabsl_log_internal_format_VERSION} +@lib lib/libabsl_log_internal_globals.so.${LIBabsl_log_internal_globals_VERSION} +@lib lib/libabsl_log_internal_log_sink_set.so.${LIBabsl_log_internal_log_sink_set_VERSION} +@lib lib/libabsl_log_internal_message.so.${LIBabsl_log_internal_message_VERSION} +@lib lib/libabsl_log_internal_nullguard.so.${LIBabsl_log_internal_nullguard_VERSION} +@lib lib/libabsl_log_internal_proto.so.${LIBabsl_log_internal_proto_VERSION} @lib lib/libabsl_log_severity.so.${LIBabsl_log_severity_VERSION} +@lib lib/libabsl_log_sink.so.${LIBabsl_log_sink_VERSION} @lib lib/libabsl_low_level_hash.so.${LIBabsl_low_level_hash_VERSION} @lib lib/libabsl_malloc_internal.so.${LIBabsl_malloc_internal_VERSION} @lib lib/libabsl_periodic_sampler.so.${LIBabsl_periodic_sampler_VERSION} @@ -422,6 +497,8 @@ lib/cmake/absl/abslTargets.cmake @lib lib/libabsl_throw_delegate.so.${LIBabsl_throw_delegate_VERSION} @lib lib/libabsl_time.so.${LIBabsl_time_VERSION} @lib lib/libabsl_time_zone.so.${LIBabsl_time_zone_VERSION} +lib/pkgconfig/absl_absl_check.pc +lib/pkgconfig/absl_absl_log.pc lib/pkgconfig/absl_algorithm.pc lib/pkgconfig/absl_algorithm_container.pc lib/pkgconfig/absl_any.pc @@ -436,10 +513,12 @@ lib/pkgconfig/absl_base_internal.pc lib/pkgconfig/absl_bind_front.pc lib/pkgconfig/absl_bits.pc lib/pkgconfig/absl_btree.pc +lib/pkgconfig/absl_check.pc lib/pkgconfig/absl_city.pc lib/pkgconfig/absl_civil_time.pc lib/pkgconfig/absl_cleanup.pc lib/pkgconfig/absl_cleanup_internal.pc +lib/pkgconfig/absl_common_policy_traits.pc lib/pkgconfig/absl_compare.pc lib/pkgconfig/absl_compressed_tuple.pc lib/pkgconfig/absl_config.pc @@ -456,8 +535,13 @@ lib/pkgconfig/absl_cordz_update_scope.pc lib/pkgconfig/absl_cordz_update_tracker.pc lib/pkgconfig/absl_core_headers.pc lib/pkgconfig/absl_counting_allocator.pc +lib/pkgconfig/absl_crc32c.pc +lib/pkgconfig/absl_crc_cord_state.pc +lib/pkgconfig/absl_crc_cpu_detect.pc +lib/pkgconfig/absl_crc_internal.pc lib/pkgconfig/absl_debugging_internal.pc lib/pkgconfig/absl_demangle_internal.pc +lib/pkgconfig/absl_die_if_null.pc lib/pkgconfig/absl_dynamic_annotations.pc lib/pkgconfig/absl_endian.pc lib/pkgconfig/absl_errno_saver.pc @@ -494,7 +578,33 @@ lib/pkgconfig/absl_inlined_vector_intern lib/pkgconfig/absl_int128.pc lib/pkgconfig/absl_kernel_timeout_internal.pc lib/pkgconfig/absl_layout.pc +lib/pkgconfig/absl_log.pc +lib/pkgconfig/absl_log_entry.pc +lib/pkgconfig/absl_log_flags.pc +lib/pkgconfig/absl_log_globals.pc +lib/pkgconfig/absl_log_initialize.pc +lib/pkgconfig/absl_log_internal_append_truncated.pc +lib/pkgconfig/absl_log_internal_check_impl.pc +lib/pkgconfig/absl_log_internal_check_op.pc +lib/pkgconfig/absl_log_internal_conditions.pc +lib/pkgconfig/absl_log_internal_config.pc +lib/pkgconfig/absl_log_internal_flags.pc +lib/pkgconfig/absl_log_internal_format.pc +lib/pkgconfig/absl_log_internal_globals.pc +lib/pkgconfig/absl_log_internal_log_impl.pc +lib/pkgconfig/absl_log_internal_log_sink_set.pc +lib/pkgconfig/absl_log_internal_message.pc +lib/pkgconfig/absl_log_internal_nullguard.pc +lib/pkgconfig/absl_log_internal_nullstream.pc +lib/pkgconfig/absl_log_internal_proto.pc +lib/pkgconfig/absl_log_internal_strip.pc +lib/pkgconfig/absl_log_internal_structured.pc +lib/pkgconfig/absl_log_internal_voidify.pc lib/pkgconfig/absl_log_severity.pc +lib/pkgconfig/absl_log_sink.pc +lib/pkgconfig/absl_log_sink_registry.pc +lib/pkgconfig/absl_log_streamer.pc +lib/pkgconfig/absl_log_structured.pc lib/pkgconfig/absl_low_level_hash.pc lib/pkgconfig/absl_malloc_internal.pc lib/pkgconfig/absl_memory.pc @@ -502,6 +612,8 @@ lib/pkgconfig/absl_meta.pc lib/pkgconfig/absl_node_hash_map.pc lib/pkgconfig/absl_node_hash_set.pc lib/pkgconfig/absl_node_slot_policy.pc +lib/pkgconfig/absl_non_temporal_arm_intrinsics.pc +lib/pkgconfig/absl_non_temporal_memcpy.pc lib/pkgconfig/absl_numeric.pc lib/pkgconfig/absl_numeric_representation.pc lib/pkgconfig/absl_optional.pc