diff options
-rw-r--r-- | devel/abseil/Makefile | 4 | ||||
-rw-r--r-- | devel/abseil/PLIST | 171 | ||||
-rw-r--r-- | devel/abseil/distinfo | 12 | ||||
-rw-r--r-- | devel/abseil/patches/patch-absl_base_config.h | 18 | ||||
-rw-r--r-- | devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc | 18 | ||||
-rw-r--r-- | devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc | 31 |
6 files changed, 171 insertions, 83 deletions
diff --git a/devel/abseil/Makefile b/devel/abseil/Makefile index 90da02a6032..c43365d62af 100644 --- a/devel/abseil/Makefile +++ b/devel/abseil/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2021/07/27 15:43:15 adam Exp $ +# $NetBSD: Makefile,v 1.10 2021/11/18 13:57:34 adam Exp $ -DISTNAME= abseil-20210324.2 +DISTNAME= abseil-20211102.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=abseil/} GITHUB_PROJECT= abseil-cpp diff --git a/devel/abseil/PLIST b/devel/abseil/PLIST index a0f7f3e3dc8..04cba414653 100644 --- a/devel/abseil/PLIST +++ b/devel/abseil/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2021/04/30 10:32:17 adam Exp $ +@comment $NetBSD: PLIST,v 1.5 2021/11/18 13:57:34 adam Exp $ include/absl/algorithm/algorithm.h include/absl/algorithm/container.h include/absl/base/attributes.h @@ -16,7 +16,6 @@ include/absl/base/internal/endian.h include/absl/base/internal/errno_saver.h include/absl/base/internal/exception_safety_testing.h include/absl/base/internal/exception_testing.h -include/absl/base/internal/exponential_biased.h include/absl/base/internal/fast_type_id.h include/absl/base/internal/hide_ptr.h include/absl/base/internal/identity.h @@ -26,7 +25,6 @@ include/absl/base/internal/invoke.h include/absl/base/internal/low_level_alloc.h include/absl/base/internal/low_level_scheduling.h include/absl/base/internal/per_thread_tls.h -include/absl/base/internal/periodic_sampler.h include/absl/base/internal/pretty_function.h include/absl/base/internal/raw_logging.h include/absl/base/internal/scheduling_mode.h @@ -101,8 +99,10 @@ include/absl/debugging/internal/stack_consumption.h include/absl/debugging/internal/stacktrace_aarch64-inl.inc include/absl/debugging/internal/stacktrace_arm-inl.inc include/absl/debugging/internal/stacktrace_config.h +include/absl/debugging/internal/stacktrace_emscripten-inl.inc include/absl/debugging/internal/stacktrace_generic-inl.inc include/absl/debugging/internal/stacktrace_powerpc-inl.inc +include/absl/debugging/internal/stacktrace_riscv-inl.inc include/absl/debugging/internal/stacktrace_unimplemented-inl.inc include/absl/debugging/internal/stacktrace_win32-inl.inc include/absl/debugging/internal/stacktrace_x86-inl.inc @@ -113,6 +113,7 @@ include/absl/debugging/stacktrace.h include/absl/debugging/symbolize.h include/absl/debugging/symbolize_darwin.inc include/absl/debugging/symbolize_elf.inc +include/absl/debugging/symbolize_emscripten.inc include/absl/debugging/symbolize_unimplemented.inc include/absl/debugging/symbolize_win32.inc include/absl/flags/commandlineflag.h @@ -121,6 +122,7 @@ include/absl/flags/declare.h include/absl/flags/flag.h include/absl/flags/internal/commandlineflag.h include/absl/flags/internal/flag.h +include/absl/flags/internal/flag_msvc.inc include/absl/flags/internal/parse.h include/absl/flags/internal/path_util.h include/absl/flags/internal/private_handle_accessor.h @@ -141,8 +143,8 @@ include/absl/hash/hash.h include/absl/hash/hash_testing.h 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/hash/internal/wyhash.h include/absl/memory/memory.h include/absl/meta/type_traits.h include/absl/numeric/bits.h @@ -151,6 +153,9 @@ include/absl/numeric/int128_have_intrinsic.inc include/absl/numeric/int128_no_intrinsic.inc include/absl/numeric/internal/bits.h include/absl/numeric/internal/representation.h +include/absl/profiling/internal/exponential_biased.h +include/absl/profiling/internal/periodic_sampler.h +include/absl/profiling/internal/sample_recorder.h include/absl/random/bernoulli_distribution.h include/absl/random/beta_distribution.h include/absl/random/bit_gen_ref.h @@ -204,14 +209,27 @@ include/absl/strings/ascii.h include/absl/strings/charconv.h include/absl/strings/cord.h include/absl/strings/cord_test_helpers.h +include/absl/strings/cordz_test_helpers.h include/absl/strings/escaping.h include/absl/strings/internal/char_map.h include/absl/strings/internal/charconv_bigint.h include/absl/strings/internal/charconv_parse.h include/absl/strings/internal/cord_internal.h +include/absl/strings/internal/cord_rep_btree.h +include/absl/strings/internal/cord_rep_btree_navigator.h +include/absl/strings/internal/cord_rep_btree_reader.h +include/absl/strings/internal/cord_rep_consume.h include/absl/strings/internal/cord_rep_flat.h include/absl/strings/internal/cord_rep_ring.h include/absl/strings/internal/cord_rep_ring_reader.h +include/absl/strings/internal/cord_rep_test_util.h +include/absl/strings/internal/cordz_functions.h +include/absl/strings/internal/cordz_handle.h +include/absl/strings/internal/cordz_info.h +include/absl/strings/internal/cordz_sample_token.h +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/escaping.h include/absl/strings/internal/escaping_test_common.h include/absl/strings/internal/memutil.h @@ -294,127 +312,137 @@ lib/cmake/absl/abslConfigVersion.cmake lib/cmake/absl/abslTargets-noconfig.cmake lib/cmake/absl/abslTargets.cmake lib/libabsl_bad_any_cast_impl.so -lib/libabsl_bad_any_cast_impl.so.2103.0.1 +lib/libabsl_bad_any_cast_impl.so.2111.0.0 lib/libabsl_bad_optional_access.so -lib/libabsl_bad_optional_access.so.2103.0.1 +lib/libabsl_bad_optional_access.so.2111.0.0 lib/libabsl_bad_variant_access.so -lib/libabsl_bad_variant_access.so.2103.0.1 +lib/libabsl_bad_variant_access.so.2111.0.0 lib/libabsl_base.so -lib/libabsl_base.so.2103.0.1 +lib/libabsl_base.so.2111.0.0 lib/libabsl_city.so -lib/libabsl_city.so.2103.0.1 +lib/libabsl_city.so.2111.0.0 lib/libabsl_civil_time.so -lib/libabsl_civil_time.so.2103.0.1 +lib/libabsl_civil_time.so.2111.0.0 lib/libabsl_cord.so -lib/libabsl_cord.so.2103.0.1 +lib/libabsl_cord.so.2111.0.0 +lib/libabsl_cord_internal.so +lib/libabsl_cord_internal.so.2111.0.0 +lib/libabsl_cordz_functions.so +lib/libabsl_cordz_functions.so.2111.0.0 +lib/libabsl_cordz_handle.so +lib/libabsl_cordz_handle.so.2111.0.0 +lib/libabsl_cordz_info.so +lib/libabsl_cordz_info.so.2111.0.0 +lib/libabsl_cordz_sample_token.so +lib/libabsl_cordz_sample_token.so.2111.0.0 lib/libabsl_debugging_internal.so -lib/libabsl_debugging_internal.so.2103.0.1 +lib/libabsl_debugging_internal.so.2111.0.0 lib/libabsl_demangle_internal.so -lib/libabsl_demangle_internal.so.2103.0.1 +lib/libabsl_demangle_internal.so.2111.0.0 lib/libabsl_examine_stack.so -lib/libabsl_examine_stack.so.2103.0.1 +lib/libabsl_examine_stack.so.2111.0.0 lib/libabsl_exponential_biased.so -lib/libabsl_exponential_biased.so.2103.0.1 +lib/libabsl_exponential_biased.so.2111.0.0 lib/libabsl_failure_signal_handler.so -lib/libabsl_failure_signal_handler.so.2103.0.1 +lib/libabsl_failure_signal_handler.so.2111.0.0 lib/libabsl_flags.so -lib/libabsl_flags.so.2103.0.1 +lib/libabsl_flags.so.2111.0.0 lib/libabsl_flags_commandlineflag.so -lib/libabsl_flags_commandlineflag.so.2103.0.1 +lib/libabsl_flags_commandlineflag.so.2111.0.0 lib/libabsl_flags_commandlineflag_internal.so -lib/libabsl_flags_commandlineflag_internal.so.2103.0.1 +lib/libabsl_flags_commandlineflag_internal.so.2111.0.0 lib/libabsl_flags_config.so -lib/libabsl_flags_config.so.2103.0.1 +lib/libabsl_flags_config.so.2111.0.0 lib/libabsl_flags_internal.so -lib/libabsl_flags_internal.so.2103.0.1 +lib/libabsl_flags_internal.so.2111.0.0 lib/libabsl_flags_marshalling.so -lib/libabsl_flags_marshalling.so.2103.0.1 +lib/libabsl_flags_marshalling.so.2111.0.0 lib/libabsl_flags_parse.so -lib/libabsl_flags_parse.so.2103.0.1 +lib/libabsl_flags_parse.so.2111.0.0 lib/libabsl_flags_private_handle_accessor.so -lib/libabsl_flags_private_handle_accessor.so.2103.0.1 +lib/libabsl_flags_private_handle_accessor.so.2111.0.0 lib/libabsl_flags_program_name.so -lib/libabsl_flags_program_name.so.2103.0.1 +lib/libabsl_flags_program_name.so.2111.0.0 lib/libabsl_flags_reflection.so -lib/libabsl_flags_reflection.so.2103.0.1 +lib/libabsl_flags_reflection.so.2111.0.0 lib/libabsl_flags_usage.so -lib/libabsl_flags_usage.so.2103.0.1 +lib/libabsl_flags_usage.so.2111.0.0 lib/libabsl_flags_usage_internal.so -lib/libabsl_flags_usage_internal.so.2103.0.1 +lib/libabsl_flags_usage_internal.so.2111.0.0 lib/libabsl_graphcycles_internal.so -lib/libabsl_graphcycles_internal.so.2103.0.1 +lib/libabsl_graphcycles_internal.so.2111.0.0 lib/libabsl_hash.so -lib/libabsl_hash.so.2103.0.1 +lib/libabsl_hash.so.2111.0.0 lib/libabsl_hashtablez_sampler.so -lib/libabsl_hashtablez_sampler.so.2103.0.1 +lib/libabsl_hashtablez_sampler.so.2111.0.0 lib/libabsl_int128.so -lib/libabsl_int128.so.2103.0.1 +lib/libabsl_int128.so.2111.0.0 lib/libabsl_leak_check.so -lib/libabsl_leak_check.so.2103.0.1 +lib/libabsl_leak_check.so.2111.0.0 lib/libabsl_leak_check_disable.so -lib/libabsl_leak_check_disable.so.2103.0.1 +lib/libabsl_leak_check_disable.so.2111.0.0 lib/libabsl_log_severity.so -lib/libabsl_log_severity.so.2103.0.1 +lib/libabsl_log_severity.so.2111.0.0 +lib/libabsl_low_level_hash.so +lib/libabsl_low_level_hash.so.2111.0.0 lib/libabsl_malloc_internal.so -lib/libabsl_malloc_internal.so.2103.0.1 +lib/libabsl_malloc_internal.so.2111.0.0 lib/libabsl_periodic_sampler.so -lib/libabsl_periodic_sampler.so.2103.0.1 +lib/libabsl_periodic_sampler.so.2111.0.0 lib/libabsl_random_distributions.so -lib/libabsl_random_distributions.so.2103.0.1 +lib/libabsl_random_distributions.so.2111.0.0 lib/libabsl_random_internal_distribution_test_util.so -lib/libabsl_random_internal_distribution_test_util.so.2103.0.1 +lib/libabsl_random_internal_distribution_test_util.so.2111.0.0 lib/libabsl_random_internal_platform.so -lib/libabsl_random_internal_platform.so.2103.0.1 +lib/libabsl_random_internal_platform.so.2111.0.0 lib/libabsl_random_internal_pool_urbg.so -lib/libabsl_random_internal_pool_urbg.so.2103.0.1 +lib/libabsl_random_internal_pool_urbg.so.2111.0.0 lib/libabsl_random_internal_randen.so -lib/libabsl_random_internal_randen.so.2103.0.1 +lib/libabsl_random_internal_randen.so.2111.0.0 lib/libabsl_random_internal_randen_hwaes.so -lib/libabsl_random_internal_randen_hwaes.so.2103.0.1 +lib/libabsl_random_internal_randen_hwaes.so.2111.0.0 lib/libabsl_random_internal_randen_hwaes_impl.so -lib/libabsl_random_internal_randen_hwaes_impl.so.2103.0.1 +lib/libabsl_random_internal_randen_hwaes_impl.so.2111.0.0 lib/libabsl_random_internal_randen_slow.so -lib/libabsl_random_internal_randen_slow.so.2103.0.1 +lib/libabsl_random_internal_randen_slow.so.2111.0.0 lib/libabsl_random_internal_seed_material.so -lib/libabsl_random_internal_seed_material.so.2103.0.1 +lib/libabsl_random_internal_seed_material.so.2111.0.0 lib/libabsl_random_seed_gen_exception.so -lib/libabsl_random_seed_gen_exception.so.2103.0.1 +lib/libabsl_random_seed_gen_exception.so.2111.0.0 lib/libabsl_random_seed_sequences.so -lib/libabsl_random_seed_sequences.so.2103.0.1 +lib/libabsl_random_seed_sequences.so.2111.0.0 lib/libabsl_raw_hash_set.so -lib/libabsl_raw_hash_set.so.2103.0.1 +lib/libabsl_raw_hash_set.so.2111.0.0 lib/libabsl_raw_logging_internal.so -lib/libabsl_raw_logging_internal.so.2103.0.1 +lib/libabsl_raw_logging_internal.so.2111.0.0 lib/libabsl_scoped_set_env.so -lib/libabsl_scoped_set_env.so.2103.0.1 +lib/libabsl_scoped_set_env.so.2111.0.0 lib/libabsl_spinlock_wait.so -lib/libabsl_spinlock_wait.so.2103.0.1 +lib/libabsl_spinlock_wait.so.2111.0.0 lib/libabsl_stacktrace.so -lib/libabsl_stacktrace.so.2103.0.1 +lib/libabsl_stacktrace.so.2111.0.0 lib/libabsl_status.so -lib/libabsl_status.so.2103.0.1 +lib/libabsl_status.so.2111.0.0 lib/libabsl_statusor.so -lib/libabsl_statusor.so.2103.0.1 +lib/libabsl_statusor.so.2111.0.0 lib/libabsl_str_format_internal.so -lib/libabsl_str_format_internal.so.2103.0.1 +lib/libabsl_str_format_internal.so.2111.0.0 lib/libabsl_strerror.so -lib/libabsl_strerror.so.2103.0.1 +lib/libabsl_strerror.so.2111.0.0 lib/libabsl_strings.so -lib/libabsl_strings.so.2103.0.1 +lib/libabsl_strings.so.2111.0.0 lib/libabsl_strings_internal.so -lib/libabsl_strings_internal.so.2103.0.1 +lib/libabsl_strings_internal.so.2111.0.0 lib/libabsl_symbolize.so -lib/libabsl_symbolize.so.2103.0.1 +lib/libabsl_symbolize.so.2111.0.0 lib/libabsl_synchronization.so -lib/libabsl_synchronization.so.2103.0.1 +lib/libabsl_synchronization.so.2111.0.0 lib/libabsl_throw_delegate.so -lib/libabsl_throw_delegate.so.2103.0.1 +lib/libabsl_throw_delegate.so.2111.0.0 lib/libabsl_time.so -lib/libabsl_time.so.2103.0.1 +lib/libabsl_time.so.2111.0.0 lib/libabsl_time_zone.so -lib/libabsl_time_zone.so.2103.0.1 -lib/libabsl_wyhash.so -lib/libabsl_wyhash.so.2103.0.1 +lib/libabsl_time_zone.so.2111.0.0 lib/pkgconfig/absl_algorithm.pc lib/pkgconfig/absl_algorithm_container.pc lib/pkgconfig/absl_any.pc @@ -438,6 +466,14 @@ lib/pkgconfig/absl_config.pc lib/pkgconfig/absl_container_common.pc lib/pkgconfig/absl_container_memory.pc lib/pkgconfig/absl_cord.pc +lib/pkgconfig/absl_cord_internal.pc +lib/pkgconfig/absl_cordz_functions.pc +lib/pkgconfig/absl_cordz_handle.pc +lib/pkgconfig/absl_cordz_info.pc +lib/pkgconfig/absl_cordz_sample_token.pc +lib/pkgconfig/absl_cordz_statistics.pc +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_debugging.pc @@ -483,6 +519,7 @@ lib/pkgconfig/absl_layout.pc lib/pkgconfig/absl_leak_check.pc lib/pkgconfig/absl_leak_check_disable.pc lib/pkgconfig/absl_log_severity.pc +lib/pkgconfig/absl_low_level_hash.pc lib/pkgconfig/absl_malloc_internal.pc lib/pkgconfig/absl_memory.pc lib/pkgconfig/absl_meta.pc @@ -523,6 +560,7 @@ lib/pkgconfig/absl_random_seed_sequences.pc lib/pkgconfig/absl_raw_hash_map.pc lib/pkgconfig/absl_raw_hash_set.pc lib/pkgconfig/absl_raw_logging_internal.pc +lib/pkgconfig/absl_sample_recorder.pc lib/pkgconfig/absl_scoped_set_env.pc lib/pkgconfig/absl_span.pc lib/pkgconfig/absl_spinlock_wait.pc @@ -542,4 +580,3 @@ lib/pkgconfig/absl_time_zone.pc lib/pkgconfig/absl_type_traits.pc lib/pkgconfig/absl_utility.pc lib/pkgconfig/absl_variant.pc -lib/pkgconfig/absl_wyhash.pc diff --git a/devel/abseil/distinfo b/devel/abseil/distinfo index a0d7105bc70..fbf8116bdb5 100644 --- a/devel/abseil/distinfo +++ b/devel/abseil/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.9 2021/10/26 10:14:12 nia Exp $ +$NetBSD: distinfo,v 1.10 2021/11/18 13:57:34 adam Exp $ -BLAKE2s (abseil-20210324.2-20210324.2.tar.gz) = 174f8e89ac50ba7201ae39947c3440775aced256f3eaff8a9ce48dc7984e2407 -SHA512 (abseil-20210324.2-20210324.2.tar.gz) = 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27 -Size (abseil-20210324.2-20210324.2.tar.gz) = 1774172 bytes -SHA1 (patch-absl_base_config.h) = 407aa5ccee356e93426647db6b405296bcd914dc +BLAKE2s (abseil-20211102.0-20211102.0.tar.gz) = a4d9e13332297a49cc2c2e17c4123afb184fe7d23e2c564587e42b95411570b9 +SHA512 (abseil-20211102.0-20211102.0.tar.gz) = fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf +Size (abseil-20211102.0-20211102.0.tar.gz) = 1884080 bytes +SHA1 (patch-absl_base_config.h) = a24bffea8e8db4e2e58ee4fb7da67282c4b73f8d +SHA1 (patch-absl_debugging_internal_elf__mem__image.cc) = 8fa49bcdb3eb0ec2591f31d3b50dbbac27e09ecb +SHA1 (patch-absl_debugging_internal_vdso__support.cc) = c01e646eb91d1dffc87181e1f5df509552916cdc SHA1 (patch-absl_time_internal_cctz_src_time__zone__format.cc) = 501736490edc62afb8b82e16f9a88e7fab6f5552 diff --git a/devel/abseil/patches/patch-absl_base_config.h b/devel/abseil/patches/patch-absl_base_config.h index c860cd5a4b2..740a17cf667 100644 --- a/devel/abseil/patches/patch-absl_base_config.h +++ b/devel/abseil/patches/patch-absl_base_config.h @@ -1,22 +1,22 @@ -$NetBSD: patch-absl_base_config.h,v 1.2 2021/04/30 10:32:17 adam Exp $ +$NetBSD: patch-absl_base_config.h,v 1.3 2021/11/18 13:57:34 adam Exp $ Add support for NetBSD. ---- absl/base/config.h.orig 2021-04-20 16:55:14.000000000 +0000 +--- absl/base/config.h.orig 2021-11-03 15:26:14.000000000 +0000 +++ absl/base/config.h -@@ -370,6 +370,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES +@@ -411,6 +411,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES #ifdef ABSL_HAVE_MMAP #error ABSL_HAVE_MMAP cannot be directly set - #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ + #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ + defined(__NetBSD__) || \ - defined(__ros__) || defined(__native_client__) || defined(__asmjs__) || \ - defined(__wasm__) || defined(__Fuchsia__) || defined(__sun) || \ - defined(__ASYLO__) || defined(__myriad2__) -@@ -383,6 +384,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES + defined(_AIX) || defined(__ros__) || defined(__native_client__) || \ + defined(__asmjs__) || defined(__wasm__) || defined(__Fuchsia__) || \ + defined(__sun) || defined(__ASYLO__) || defined(__myriad2__) || \ +@@ -425,6 +426,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES #ifdef ABSL_HAVE_PTHREAD_GETSCHEDPARAM #error ABSL_HAVE_PTHREAD_GETSCHEDPARAM cannot be directly set #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ + defined(__NetBSD__) || \ - defined(__ros__) + defined(_AIX) || defined(__ros__) #define ABSL_HAVE_PTHREAD_GETSCHEDPARAM 1 #endif diff --git a/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc b/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc new file mode 100644 index 00000000000..9414f16f477 --- /dev/null +++ b/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc @@ -0,0 +1,18 @@ +$NetBSD: patch-absl_debugging_internal_elf__mem__image.cc,v 1.1 2021/11/18 13:57:34 adam Exp $ + +Support NetBSD. + +--- absl/debugging/internal/elf_mem_image.cc.orig 2021-11-18 09:35:34.106564193 +0000 ++++ absl/debugging/internal/elf_mem_image.cc +@@ -351,7 +351,11 @@ void ElfMemImage::SymbolIterator::Update + const ElfW(Versym) *version_symbol = image->GetVersym(index_); + ABSL_RAW_CHECK(symbol && version_symbol, ""); + const char *const symbol_name = image->GetDynstr(symbol->st_name); ++#if defined(__NetBSD__) ++ int version_index = version_symbol->vs_vers & VERSYM_VERSION; ++#else + const ElfW(Versym) version_index = version_symbol[0] & VERSYM_VERSION; ++#endif + const ElfW(Verdef) *version_definition = nullptr; + const char *version_name = ""; + if (symbol->st_shndx == SHN_UNDEF) { diff --git a/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc b/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc new file mode 100644 index 00000000000..05f8b0a80e9 --- /dev/null +++ b/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc @@ -0,0 +1,31 @@ +$NetBSD: patch-absl_debugging_internal_vdso__support.cc,v 1.1 2021/11/18 13:57:34 adam Exp $ + +Support NetBSD. + +--- absl/debugging/internal/vdso_support.cc.orig 2021-11-18 10:00:05.006467401 +0000 ++++ absl/debugging/internal/vdso_support.cc +@@ -50,6 +50,10 @@ + #define AT_SYSINFO_EHDR 33 // for crosstoolv10 + #endif + ++#if defined(__NetBSD__) ++using Elf32_auxv_t = Aux32Info; ++using Elf64_auxv_t = Aux64Info; ++#endif + #if defined(__FreeBSD__) + using Elf64_auxv_t = Elf64_Auxinfo; + using Elf32_auxv_t = Elf32_Auxinfo; +@@ -104,8 +108,13 @@ const void *VDSOSupport::Init() { + ElfW(auxv_t) aux; + while (read(fd, &aux, sizeof(aux)) == sizeof(aux)) { + if (aux.a_type == AT_SYSINFO_EHDR) { ++#if defined(__NetBSD__) ++ vdso_base_.store(reinterpret_cast<void *>(aux.a_v), ++ std::memory_order_relaxed); ++#else + vdso_base_.store(reinterpret_cast<void *>(aux.a_un.a_val), + std::memory_order_relaxed); ++#endif + break; + } + } |