On Thu, Dec 01, 2022 at 09:55:05AM +0000, Stuart Henderson wrote:
> On 2022/12/01 00:17, Klemens Nanni wrote:
> > https://github.com/abseil/abseil-cpp/releases/tag/20220623.1
> >
> > Most #ifdef OpenBSD hunks were merged, rest of the patches remains the
> > same (with update churn).
> >
> > make test on amd64:
> > 98% tests passed, 3 tests failed out of 178
> >
> > Total Test time (real) = 183.26 sec
> >
> > The following tests FAILED:
> > 132 - absl_charconv_test (Failed)
> > 140 - absl_str_format_convert_test (Failed)
> > 167 - absl_time_test (Failed)
> >
> > I'll take a look at those tests tomorrow.
>
> Build fails here:
Sorry, forgot to add one patch.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 11 Mar 2022 18:49:30 -0000 1.6
+++ Makefile 30 Nov 2022 23:24:26 -0000
@@ -1,10 +1,9 @@
COMMENT = abseil common libraries (c++)
-REVISION = 2
CATEGORIES = devel
GH_ACCOUNT = abseil
GH_PROJECT = ${GH_ACCOUNT}-cpp
-GH_TAGNAME = 20211102.0
+GH_TAGNAME = 20220623.1
HOMEPAGE = https://abseil.io/
@@ -14,78 +13,76 @@ MAINTAINER = Andrew Krasavin <noiseless-
# Apache 2.0
PERMIT_PACKAGE = Yes
-SHARED_LIBS += absl_bad_any_cast_impl 0.0 # 2103.0.1
-SHARED_LIBS += absl_bad_optional_access 0.0 # 2103.0.1
-SHARED_LIBS += absl_bad_variant_access 0.0 # 2103.0.1
-SHARED_LIBS += absl_base 0.0 # 2103.0.1
-SHARED_LIBS += absl_city 0.0 # 2103.0.1
-SHARED_LIBS += absl_civil_time 0.0 # 2103.0.1
-SHARED_LIBS += absl_cord 0.0 # 2103.0.1
-SHARED_LIBS += absl_cord_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_cordz_functions 0.0 # 2103.0.1
-SHARED_LIBS += absl_cordz_handle 0.0 # 2103.0.1
-SHARED_LIBS += absl_cordz_info 0.0 # 2103.0.1
-SHARED_LIBS += absl_cordz_sample_token 0.0 # 2103.0.1
-SHARED_LIBS += absl_debugging_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_demangle_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_examine_stack 0.0 # 2103.0.1
-SHARED_LIBS += absl_exponential_biased 0.0 # 2103.0.1
-SHARED_LIBS += absl_failure_signal_handler 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_commandlineflag 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_commandlineflag_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_config 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_marshalling 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_parse 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_private_handle_accessor 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_program_name 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_reflection 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_usage 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_usage_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_graphcycles_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_hash 0.0 # 2103.0.1
-SHARED_LIBS += absl_hashtablez_sampler 0.0 # 2103.0.1
-SHARED_LIBS += absl_int128 0.0 # 2103.0.1
-SHARED_LIBS += absl_leak_check 0.0 # 2103.0.1
-SHARED_LIBS += absl_leak_check_disable 0.0 # 2103.0.1
-SHARED_LIBS += absl_log_severity 0.0 # 2103.0.1
-SHARED_LIBS += absl_low_level_hash 0.0 # 2103.0.1
-SHARED_LIBS += absl_malloc_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_periodic_sampler 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_distributions 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_distribution_test_util 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_platform 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_pool_urbg 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_randen 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_randen_hwaes 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_randen_hwaes_impl 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_randen_slow 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_seed_material 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_seed_gen_exception 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_seed_sequences 0.0 # 2103.0.1
-SHARED_LIBS += absl_raw_hash_set 0.0 # 2103.0.1
-SHARED_LIBS += absl_raw_logging_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_scoped_set_env 0.0 # 2103.0.1
-SHARED_LIBS += absl_spinlock_wait 0.0 # 2103.0.1
-SHARED_LIBS += absl_stacktrace 0.0 # 2103.0.1
-SHARED_LIBS += absl_status 0.0 # 2103.0.1
-SHARED_LIBS += absl_statusor 0.0 # 2103.0.1
-SHARED_LIBS += absl_str_format_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_strerror 0.0 # 2103.0.1
-SHARED_LIBS += absl_strings 0.0 # 2103.0.1
-SHARED_LIBS += absl_strings_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_symbolize 0.0 # 2103.0.1
-SHARED_LIBS += absl_synchronization 0.0 # 2103.0.1
-SHARED_LIBS += absl_throw_delegate 0.0 # 2103.0.1
-SHARED_LIBS += absl_time 0.0 # 2103.0.1
-SHARED_LIBS += absl_time_zone 0.0 # 2103.0.1
-SHARED_LIBS += absl_wyhash 0.0 # 2103.0.1
+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
# C++17
COMPILER = base-clang ports-gcc
COMPILER_LANGS= c++
-WANTLIB = ${COMPILER_LIBCXX} m
+WANTLIB = ${COMPILER_LIBCXX} execinfo m
MODULES = devel/cmake
CONFIGURE_ARGS += -DBUILD_SHARED_LIBS:BOOL=ON
@@ -106,7 +103,8 @@ NO_TEST = Yes
# use googletest from ports
CONFIGURE_ARGS += -DABSL_USE_EXTERNAL_GOOGLETEST:BOOL=${LOCALBASE}/include/gtest
# turn on tests builds
-CONFIGURE_ARGS += -DBUILD_TESTING:BOOL=ON
+CONFIGURE_ARGS += -DBUILD_TESTING:BOOL=ON \
+ -DABSL_BUILD_TESTING:BOOL=ON
BUILD_DEPENDS += devel/gtest>=1.11.0pl20220208
TEST_DEPENDS += devel/gtest>=1.11.0pl20220208
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 18 Dec 2021 19:38:17 -0000 1.1.1.1
+++ distinfo 30 Nov 2022 23:20:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (abseil-cpp-20211102.0.tar.gz) = 3PcbnLqNwMqZQMSzFqDHlr6Pq0KwcLtrfKtitI8OZsQ=
-SIZE (abseil-cpp-20211102.0.tar.gz) = 1884080
+SHA256 (abseil-cpp-20220623.1.tar.gz) = kayH0wzG15+auXTFGHSnBN6cJkfED2kyWXMpooIhe6g=
+SIZE (abseil-cpp-20220623.1.tar.gz) = 1957483
Index: patches/patch-absl_base_config_h
===================================================================
RCS file: patches/patch-absl_base_config_h
diff -N patches/patch-absl_base_config_h
--- patches/patch-absl_base_config_h 11 Mar 2022 18:49:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-Adding OpenBSD to the list of platforms that have mmap(2) and
-pthread_(get|set)schedparam(3).
-
-Index: absl/base/config.h
---- absl/base/config.h.orig
-+++ absl/base/config.h
-@@ -414,7 +414,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
- defined(_AIX) || defined(__ros__) || defined(__native_client__) || \
- defined(__asmjs__) || defined(__wasm__) || defined(__Fuchsia__) || \
- defined(__sun) || defined(__ASYLO__) || defined(__myriad2__) || \
-- defined(__HAIKU__)
-+ defined(__HAIKU__) || defined(__OpenBSD__)
- #define ABSL_HAVE_MMAP 1
-
No comments:
Post a Comment