From 827b025871c67a056919f0b87bbe678b6becec18 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 2 Feb 2022 15:10:43 +1000 Subject: [PATCH] abseil-cpp: bump version --- ....2.recipe => abseil_cpp-20211102.0.recipe} | 13 ++++---- .../patches/abseil_cpp-20210324.2.patchset | 31 ------------------- .../patches/abseil_cpp-20211102.0.patchset | 22 +++++++++++++ 3 files changed, 29 insertions(+), 37 deletions(-) rename dev-cpp/abseil-cpp/{abseil_cpp-20210324.2.recipe => abseil_cpp-20211102.0.recipe} (87%) delete mode 100644 dev-cpp/abseil-cpp/patches/abseil_cpp-20210324.2.patchset create mode 100644 dev-cpp/abseil-cpp/patches/abseil_cpp-20211102.0.patchset diff --git a/dev-cpp/abseil-cpp/abseil_cpp-20210324.2.recipe b/dev-cpp/abseil-cpp/abseil_cpp-20211102.0.recipe similarity index 87% rename from dev-cpp/abseil-cpp/abseil_cpp-20210324.2.recipe rename to dev-cpp/abseil-cpp/abseil_cpp-20211102.0.recipe index eb37dd269..5780c6cd7 100644 --- a/dev-cpp/abseil-cpp/abseil_cpp-20210324.2.recipe +++ b/dev-cpp/abseil-cpp/abseil_cpp-20211102.0.recipe @@ -4,25 +4,26 @@ C++11) designed to augment the C++ standard library." HOMEPAGE="https://abseil.io" COPYRIGHT="2017-2021 The Abseil Authors" LICENSE="Apache v2" -REVISION="3" +REVISION="1" SOURCE_URI="http://github.com/abseil/abseil-cpp/archive/$portVersion/abseil-$portVersion.tar.gz" -CHECKSUM_SHA256="59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f" +CHECKSUM_SHA256="dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4" SOURCE_DIR="abseil-cpp-$portVersion" PATCHES="abseil_cpp-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="2103.0.1" +libVersion="2111.0.0" libVersionCompat="$libVersion compat >= $libVersion" libs=" bad_optional_access bad_variant_access bad_any_cast_impl base city \ -civil_time cord debugging_internal demangle_internal examine_stack \ +civil_time cord cord_internal cordz_functions cordz_handle cordz_info \ +cordz_sample_token debugging_internal demangle_internal 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 leak_check leak_check_disable log_severity malloc_internal \ +int128 leak_check leak_check_disable 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 \ random_internal_randen_hwaes random_internal_randen_hwaes_impl \ @@ -30,7 +31,7 @@ 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" +synchronization throw_delegate time time_zone" PROVIDES=" abseil_cpp$secondaryArchSuffix = $portVersion " diff --git a/dev-cpp/abseil-cpp/patches/abseil_cpp-20210324.2.patchset b/dev-cpp/abseil-cpp/patches/abseil_cpp-20210324.2.patchset deleted file mode 100644 index c5248dc08..000000000 --- a/dev-cpp/abseil-cpp/patches/abseil_cpp-20210324.2.patchset +++ /dev/null @@ -1,31 +0,0 @@ -From 3724b2ecb515c4440bb3a22ed39733ba2a1737d8 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 18 Oct 2021 14:37:02 +0200 -Subject: Haiku: mmap and alarm supported - - -diff --git a/absl/base/config.h b/absl/base/config.h -index 9544996..a172b02 100644 ---- a/absl/base/config.h -+++ b/absl/base/config.h -@@ -372,7 +372,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || - #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ - defined(__ros__) || defined(__native_client__) || defined(__asmjs__) || \ - defined(__wasm__) || defined(__Fuchsia__) || defined(__sun) || \ -- defined(__ASYLO__) || defined(__myriad2__) -+ defined(__ASYLO__) || defined(__myriad2__) || defined(__HAIKU__) - #define ABSL_HAVE_MMAP 1 - #endif - -@@ -430,7 +430,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || - #elif defined(__GOOGLE_GRTE_VERSION__) - // feature tests for Google's GRTE - #define ABSL_HAVE_ALARM 1 --#elif defined(__GLIBC__) -+#elif defined(__GLIBC__) || defined(__HAIKU__) - // feature test for glibc - #define ABSL_HAVE_ALARM 1 - #elif defined(_MSC_VER) --- -2.30.2 - diff --git a/dev-cpp/abseil-cpp/patches/abseil_cpp-20211102.0.patchset b/dev-cpp/abseil-cpp/patches/abseil_cpp-20211102.0.patchset new file mode 100644 index 000000000..68c4dcc2c --- /dev/null +++ b/dev-cpp/abseil-cpp/patches/abseil_cpp-20211102.0.patchset @@ -0,0 +1,22 @@ +From 1c0c5b773743002bddd25fd838a152ae807eadfd Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Wed, 2 Feb 2022 15:04:07 +1000 +Subject: Disable dynamic symbol lookup for in-memory Elf images + + +diff --git a/absl/debugging/internal/elf_mem_image.h b/absl/debugging/internal/elf_mem_image.h +index a894bd4..949aef7 100644 +--- a/absl/debugging/internal/elf_mem_image.h ++++ b/absl/debugging/internal/elf_mem_image.h +@@ -32,7 +32,7 @@ + #endif + + #if defined(__ELF__) && !defined(__native_client__) && !defined(__asmjs__) && \ +- !defined(__wasm__) ++ !defined(__wasm__) && !defined(__HAIKU__) + #define ABSL_HAVE_ELF_MEM_IMAGE 1 + #endif + +-- +2.30.2 +