From 7ad1d06a875bccbba3d41bdfa64d9326b406b1f7 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 26 Jun 2023 21:24:01 +0200 Subject: [PATCH] abseil-cpp: update to 20230125.3. --- common/shlibs | 128 ++++++++++++------ srcpkgs/abseil-cpp/patches/google-sucks.patch | 77 ----------- srcpkgs/abseil-cpp/template | 9 +- 3 files changed, 90 insertions(+), 124 deletions(-) delete mode 100644 srcpkgs/abseil-cpp/patches/google-sucks.patch diff --git a/common/shlibs b/common/shlibs index 4b2122d1b19..d1e779f4e7c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4207,51 +4207,89 @@ libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1 libtpm2-totp.so.0 libtpm2-totp-0.3.0_1 libmujs.so.1.2.0 mujs-1.2.0_2 libiir.so.1 libiir1-1.9.3_1 -libabsl_statusor.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_hash.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_raw_hash_set.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_bad_variant_access.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_status.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_pool_urbg.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_randen.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_randen_hwaes_impl.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_randen_slow.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_cord.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_city.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_bad_optional_access.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_cordz_info.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_str_format_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_synchronization.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_time.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_base.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_civil_time.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_cord_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_cordz_functions.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_cordz_handle.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_debugging_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_demangle_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_exponential_biased.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_graphcycles_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_hashtablez_sampler.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_int128.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_log_severity.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_low_level_hash.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_malloc_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_distributions.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_platform.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_randen_hwaes.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_seed_material.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_seed_gen_exception.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_seed_sequences.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_raw_logging_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_stacktrace.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_strerror.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_strings_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_symbolize.so.2206.0.0 abseil-cpp-20220623.1_1 +libabsl_flags.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_raw_logging_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_parse.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_reflection.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_globals.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_config.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_seed_sequences.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_statusor.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_usage_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_commandlineflag.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_randen_hwaes_impl.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_status.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_bad_any_cast_impl.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_bad_variant_access.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_raw_hash_set.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_bad_optional_access.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cord.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_distribution_test_util.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cordz_handle.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_graphcycles_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_spinlock_wait.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cordz_functions.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_usage.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_debugging_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_strerror.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_seed_material.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_log_sink_set.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_proto.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_crc_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_civil_time.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_conditions.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_crc_cpu_detect.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_entry.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_distributions.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_globals.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_format.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_randen.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_exponential_biased.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_city.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_symbolize.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_leak_check.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_low_level_hash.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_severity.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_scoped_set_env.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_strings.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_die_if_null.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_hash.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_commandlineflag_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_periodic_sampler.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_platform.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_malloc_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cordz_sample_token.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_str_format_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_synchronization.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_message.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_strings_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_private_handle_accessor.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cord_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_randen_hwaes.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_throw_delegate.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_crc_cord_state.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_flags.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_program_name.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_time_zone.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_examine_stack.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_crc32c.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_initialize.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_failure_signal_handler.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_time.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cordz_info.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_sink.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_nullguard.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_demangle_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_base.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_hashtablez_sampler.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_marshalling.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_pool_urbg.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_int128.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_stacktrace.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_seed_gen_exception.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_check_op.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_randen_slow.so.2301.0.0 abseil-cpp-20230125.3_1 libairspyhf.so.0 libairspyhf-1.6.8_1 libtraceevent.so.1 libtraceevent-1.6.2_1 libtracefs.so.1 libtracefs-1.4.2_1 diff --git a/srcpkgs/abseil-cpp/patches/google-sucks.patch b/srcpkgs/abseil-cpp/patches/google-sucks.patch deleted file mode 100644 index 511bae84710..00000000000 --- a/srcpkgs/abseil-cpp/patches/google-sucks.patch +++ /dev/null @@ -1,77 +0,0 @@ -commit 1fbfea71fb42b2e79f9e342c1843bd26a8703536 -Author: Daniel Kolesa -Date: Thu Aug 25 01:20:58 2022 +0200 - - An all-in-one patch that fixes several issues: - - 1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) - 2) powerpc stacktrace implementation only works on glibc (disabled on musl) - 3) powerpc stacktrace implementation has ppc64 assumptions (fixed) - 4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) - -diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc -index b1c396c..d62bfd6 100644 ---- a/absl/base/internal/unscaledcycleclock.cc -+++ b/absl/base/internal/unscaledcycleclock.cc -@@ -20,7 +20,7 @@ - #include - #endif - --#if defined(__powerpc__) || defined(__ppc__) -+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - #ifdef __GLIBC__ - #include - #elif defined(__FreeBSD__) -@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() { - return base_internal::NominalCPUFrequency(); - } - --#elif defined(__powerpc__) || defined(__ppc__) -+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - - int64_t UnscaledCycleClock::Now() { - #ifdef __GLIBC__ -diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h -index 2cbeae3..83d8c98 100644 ---- a/absl/base/internal/unscaledcycleclock.h -+++ b/absl/base/internal/unscaledcycleclock.h -@@ -46,8 +46,8 @@ - - // 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(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) -+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ -+ defined(__riscv) || defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 - #else - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0 -diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc -index 5bdd341..a42a3c4 100644 ---- a/absl/debugging/internal/examine_stack.cc -+++ b/absl/debugging/internal/examine_stack.cc -@@ -174,8 +174,10 @@ void* GetProgramCounter(void* const vuc) { - return reinterpret_cast(context->uc_mcontext.pc); - #elif defined(__powerpc64__) - return reinterpret_cast(context->uc_mcontext.gp_regs[32]); --#elif defined(__powerpc__) -+#elif defined(__powerpc__) && defined(__GLIBC__) - return reinterpret_cast(context->uc_mcontext.uc_regs->gregs[32]); -+#elif defined(__powerpc__) -+ return reinterpret_cast(context->uc_mcontext.gregs[32]); - #elif defined(__riscv) - return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); - #elif defined(__s390__) && !defined(__s390x__) -diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h -index 3929b1b..23d5e50 100644 ---- a/absl/debugging/internal/stacktrace_config.h -+++ b/absl/debugging/internal/stacktrace_config.h -@@ -60,7 +60,7 @@ - #elif defined(__i386__) || defined(__x86_64__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_x86-inl.inc" --#elif defined(__ppc__) || defined(__PPC__) -+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_powerpc-inl.inc" - #elif defined(__aarch64__) diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template index 8640d248940..ea2fa250687 100644 --- a/srcpkgs/abseil-cpp/template +++ b/srcpkgs/abseil-cpp/template @@ -1,16 +1,21 @@ # Template file for 'abseil-cpp' pkgname=abseil-cpp -version=20220623.1 +version=20230125.3 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DABSL_PROPAGATE_CXX_STD=ON" hostmakedepends="pkg-config" +makedepends="libatomic-devel" short_desc="Abseil common libraries" maintainer="Andrew J. Hesford " license="Apache-2.0" homepage="https://abseil.io" distfiles="https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz" -checksum=91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8 +checksum=5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36 + +if [ $XBPS_TARGET_NO_ATOMIC8 ]; then + configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" +fi abseil-cpp-devel_package() { short_desc+=" (development files)"