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.
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?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 4 Dec 2022 17:23:22 -0000 1.7
+++ Makefile 30 Jan 2023 17:19:58 -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/
@@ -13,71 +13,30 @@ MAINTAINER = Andrew Krasavin <noiseless-
# Apache 2.0
PERMIT_PACKAGE = Yes
-SHARED_LIBS += absl_bad_any_cast_impl 1.0 # 2206.0.0
-SHARED_LIBS += absl_bad_optional_access 1.0 # 2206.0.0
-SHARED_LIBS += absl_bad_variant_access 1.0 # 2206.0.0
-SHARED_LIBS += absl_base 1.0 # 2206.0.0
-SHARED_LIBS += absl_city 1.0 # 2206.0.0
-SHARED_LIBS += absl_civil_time 1.0 # 2206.0.0
-SHARED_LIBS += absl_cord 1.0 # 2206.0.0
-SHARED_LIBS += absl_cord_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_cordz_functions 1.0 # 2206.0.0
-SHARED_LIBS += absl_cordz_handle 1.0 # 2206.0.0
-SHARED_LIBS += absl_cordz_info 1.0 # 2206.0.0
-SHARED_LIBS += absl_cordz_sample_token 1.0 # 2206.0.0
-SHARED_LIBS += absl_debugging_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_demangle_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_examine_stack 1.0 # 2206.0.0
-SHARED_LIBS += absl_exponential_biased 1.0 # 2206.0.0
-SHARED_LIBS += absl_failure_signal_handler 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_commandlineflag 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_commandlineflag_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_config 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_marshalling 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_parse 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_private_handle_accessor 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_program_name 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_reflection 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_usage 1.0 # 2206.0.0
-SHARED_LIBS += absl_flags_usage_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_graphcycles_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_hash 1.0 # 2206.0.0
-SHARED_LIBS += absl_hashtablez_sampler 1.0 # 2206.0.0
-SHARED_LIBS += absl_int128 1.0 # 2206.0.0
-SHARED_LIBS += absl_log_severity 1.0 # 2206.0.0
-SHARED_LIBS += absl_low_level_hash 1.0 # 2206.0.0
-SHARED_LIBS += absl_malloc_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_periodic_sampler 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_distributions 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_internal_distribution_test_util 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_internal_platform 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_internal_pool_urbg 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_internal_randen 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_internal_randen_hwaes 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_internal_randen_hwaes_impl 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_internal_randen_slow 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_internal_seed_material 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_seed_gen_exception 1.0 # 2206.0.0
-SHARED_LIBS += absl_random_seed_sequences 1.0 # 2206.0.0
-SHARED_LIBS += absl_raw_hash_set 1.0 # 2206.0.0
-SHARED_LIBS += absl_raw_logging_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_scoped_set_env 1.0 # 2206.0.0
-SHARED_LIBS += absl_spinlock_wait 1.0 # 2206.0.0
-SHARED_LIBS += absl_stacktrace 1.0 # 2206.0.0
-SHARED_LIBS += absl_status 1.0 # 2206.0.0
-SHARED_LIBS += absl_statusor 1.0 # 2206.0.0
-SHARED_LIBS += absl_str_format_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_strerror 1.0 # 2206.0.0
-SHARED_LIBS += absl_strings 1.0 # 2206.0.0
-SHARED_LIBS += absl_strings_internal 1.0 # 2206.0.0
-SHARED_LIBS += absl_symbolize 1.0 # 2206.0.0
-SHARED_LIBS += absl_synchronization 1.0 # 2206.0.0
-SHARED_LIBS += absl_throw_delegate 1.0 # 2206.0.0
-SHARED_LIBS += absl_time 1.0 # 2206.0.0
-SHARED_LIBS += absl_time_zone 1.0 # 2206.0.0
-SHARED_LIBS += absl_wyhash 1.0 # 2206.0.0
+for _lib in \
+ 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 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_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 \
+ raw_logging_internal scoped_set_env spinlock_wait stacktrace status \
+ statusor str_format_internal strerror strings strings_internal symbolize \
+ synchronization throw_delegate time time_zone wyhash \
+SHARED_LIBS += absl_${_lib} 2.0 # 2301.0.0
+.endfor
# C++17
COMPILER = base-clang ports-gcc
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 30 Jan 2023 17:09:29 -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 29 Jan 2023 14:11:00 -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(__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.3
diff -u -p -r1.3 patch-absl_debugging_CMakeLists_txt
--- patches/patch-absl_debugging_CMakeLists_txt 4 Dec 2022 17:23:22 -0000 1.3
+++ patches/patch-absl_debugging_CMakeLists_txt 29 Jan 2023 14:08:52 -0000
@@ -4,7 +4,7 @@ OpenBSD does not support it.
Index: absl/debugging/CMakeLists.txt
--- absl/debugging/CMakeLists.txt.orig
+++ absl/debugging/CMakeLists.txt
-@@ -206,6 +206,7 @@ absl_cc_test(
+@@ -220,6 +220,7 @@ absl_cc_test(
GTest::gmock_main
)
@@ -12,7 +12,7 @@ Index: absl/debugging/CMakeLists.txt
absl_cc_library(
NAME
leak_check
-@@ -235,6 +236,7 @@ absl_cc_test(
+@@ -249,6 +250,7 @@ absl_cc_test(
absl::base
GTest::gmock_main
)
@@ -20,7 +20,7 @@ Index: absl/debugging/CMakeLists.txt
# Internal-only target, do not depend on directly.
absl_cc_library(
-@@ -253,6 +255,7 @@ absl_cc_library(
+@@ -267,6 +269,7 @@ absl_cc_library(
TESTONLY
)
@@ -28,7 +28,7 @@ Index: absl/debugging/CMakeLists.txt
absl_cc_test(
NAME
stack_consumption_test
-@@ -278,3 +281,4 @@ absl_cc_library(
+@@ -292,3 +295,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 @@
-
No comments:
Post a Comment