Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Jul 2024 08:12:44 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 14567d248b87 - main - devel/pika: update 0.25.0 =?utf-8?Q?=E2=86=92?= 0.26.0
Message-ID:  <202407090812.4698CidV017912@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=14567d248b8703391b8924cc3a28e85f872a0aaf

commit 14567d248b8703391b8924cc3a28e85f872a0aaf
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-07-09 07:33:17 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-07-09 08:12:37 +0000

    devel/pika: update 0.25.0 → 0.26.0
    
    Reported by:    portscout
---
 devel/pika/Makefile                                   |  7 ++-----
 devel/pika/distinfo                                   |  8 +++-----
 ...artitioner_tests_unit_shutdown__suspended__pus.cpp | 19 +++++++++++++++++++
 ...urce__partitioner_tests_unit_suspend__disabled.cpp | 19 +++++++++++++++++++
 ...libs_pika_threading_tests_unit_error__callback.cpp | 19 +++++++++++++++++++
 devel/pika/pkg-plist                                  | 11 ++---------
 6 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/devel/pika/Makefile b/devel/pika/Makefile
index fd625d48ae6c..f86d2c9795e5 100644
--- a/devel/pika/Makefile
+++ b/devel/pika/Makefile
@@ -1,10 +1,7 @@
 PORTNAME=	pika
-DISTVERSION=	0.25.0
+DISTVERSION=	0.26.0
 CATEGORIES=	devel
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	f4378fc49f9fff14dbb03a1111f8be01f6b0f37c.patch:-p1 # fix assert in the FreeBSD version of get_executable_prefix, https://github.com/pika-org/pika/pull/1171
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for concurrency and parallelism
 WWW=		https://github.com/pika-org/pika
@@ -36,7 +33,7 @@ post-install:
 	@${RM} -r ${STAGEDIR}${DATADIR} # remove copy of license
 
 post-test: # run the tests according to https://pikacpp.org/usage.html#testing (make tests test doesn't work)
-	# some tests fail, see https://github.com/pika-org/pika/issues/895
+	# some tests fail because freebsd_environ isn't initialized, see https://github.com/pika-org/pika/issues/895
 	@cd ${BUILD_WRKSRC} && \
 		${MAKE_CMD} test
 
diff --git a/devel/pika/distinfo b/devel/pika/distinfo
index 2c4fca808150..ef4766440dd2 100644
--- a/devel/pika/distinfo
+++ b/devel/pika/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1718255130
-SHA256 (pika-org-pika-0.25.0_GH0.tar.gz) = 6646e12f88049116d84ce0caeedaa039a13caaa0431964caea4660b739767b2e
-SIZE (pika-org-pika-0.25.0_GH0.tar.gz) = 1042656
-SHA256 (f4378fc49f9fff14dbb03a1111f8be01f6b0f37c.patch) = 3eb9066027a606742db350ab1a96547132327e46d762ea97d4ab8e8925c9b8f8
-SIZE (f4378fc49f9fff14dbb03a1111f8be01f6b0f37c.patch) = 840
+TIMESTAMP = 1720498635
+SHA256 (pika-org-pika-0.26.0_GH0.tar.gz) = bbec5472c71006c1f55e7946c8dc517dae76c41cacb36fa98195312c74a1bb9a
+SIZE (pika-org-pika-0.26.0_GH0.tar.gz) = 1041736
diff --git a/devel/pika/files/patch-libs_pika_resource__partitioner_tests_unit_shutdown__suspended__pus.cpp b/devel/pika/files/patch-libs_pika_resource__partitioner_tests_unit_shutdown__suspended__pus.cpp
new file mode 100644
index 000000000000..4b0c39febda1
--- /dev/null
+++ b/devel/pika/files/patch-libs_pika_resource__partitioner_tests_unit_shutdown__suspended__pus.cpp
@@ -0,0 +1,19 @@
+--- libs/pika/resource_partitioner/tests/unit/shutdown_suspended_pus.cpp.orig	2024-07-09 07:28:43 UTC
++++ libs/pika/resource_partitioner/tests/unit/shutdown_suspended_pus.cpp
+@@ -75,8 +75,16 @@ void test_scheduler(int argc, char* argv[], pika::reso
+     PIKA_TEST_EQ(pika::init(pika_main, argc, argv, init_args), 0);
+ }
+ 
++#if defined(__FreeBSD__)
++extern char **environ;
++#endif
++
+ int main(int argc, char* argv[])
+ {
++#if defined(__FreeBSD__)
++    freebsd_environ = environ;
++#endif
++
+     PIKA_ASSERT(max_threads >= 2);
+ 
+     {
diff --git a/devel/pika/files/patch-libs_pika_resource__partitioner_tests_unit_suspend__disabled.cpp b/devel/pika/files/patch-libs_pika_resource__partitioner_tests_unit_suspend__disabled.cpp
new file mode 100644
index 000000000000..2461fd3e3dd8
--- /dev/null
+++ b/devel/pika/files/patch-libs_pika_resource__partitioner_tests_unit_suspend__disabled.cpp
@@ -0,0 +1,19 @@
+--- libs/pika/resource_partitioner/tests/unit/suspend_disabled.cpp.orig	2024-07-09 07:19:49 UTC
++++ libs/pika/resource_partitioner/tests/unit/suspend_disabled.cpp
+@@ -43,8 +43,16 @@ int pika_main()
+     return EXIT_SUCCESS;
+ }
+ 
++#if defined(__FreeBSD__)
++extern char **environ;
++#endif
++
+ int main(int argc, char* argv[])
+ {
++#if defined(__FreeBSD__)
++    freebsd_environ = environ;
++#endif
++
+     pika::init_params init_args;
+ 
+     using ::pika::threads::scheduler_mode;
diff --git a/devel/pika/files/patch-libs_pika_threading_tests_unit_error__callback.cpp b/devel/pika/files/patch-libs_pika_threading_tests_unit_error__callback.cpp
new file mode 100644
index 000000000000..4efae575a200
--- /dev/null
+++ b/devel/pika/files/patch-libs_pika_threading_tests_unit_error__callback.cpp
@@ -0,0 +1,19 @@
+--- libs/pika/threading/tests/unit/error_callback.cpp.orig	2024-07-09 07:16:05 UTC
++++ libs/pika/threading/tests/unit/error_callback.cpp
+@@ -30,8 +30,16 @@ int pika_main()
+     return EXIT_SUCCESS;
+ }
+ 
++#if defined(__FreeBSD__)
++extern char **environ;
++#endif
++
+ int main(int argc, char* argv[])
+ {
++#if defined(__FreeBSD__)
++    freebsd_environ = environ;
++#endif
++
+     auto on_stop = pika::detail::register_thread_on_error_func(&on_thread_error);
+     PIKA_TEST(on_stop.empty());
+ 
diff --git a/devel/pika/pkg-plist b/devel/pika/pkg-plist
index f30728d9f361..8d11bcfe6020 100644
--- a/devel/pika/pkg-plist
+++ b/devel/pika/pkg-plist
@@ -91,9 +91,9 @@ include/pika/datastructures/traits/is_tuple_like.hpp
 include/pika/datastructures/variant.hpp
 include/pika/debugging/attach_debugger.hpp
 include/pika/debugging/backtrace.hpp
-include/pika/debugging/backtrace/backtrace.hpp
 include/pika/debugging/config/defines.hpp
 include/pika/debugging/demangle_helper.hpp
+include/pika/debugging/detail/backtrace.hpp
 include/pika/debugging/environ.hpp
 include/pika/debugging/print.hpp
 include/pika/detail/filesystem.hpp
@@ -175,7 +175,6 @@ include/pika/functional/one_shot.hpp
 include/pika/functional/tag_invoke.hpp
 include/pika/functional/traits/get_function_address.hpp
 include/pika/functional/traits/get_function_annotation.hpp
-include/pika/functional/traits/is_action.hpp
 include/pika/functional/traits/is_bind_expression.hpp
 include/pika/functional/unique_function.hpp
 include/pika/hashing/config/defines.hpp
@@ -235,7 +234,6 @@ include/pika/modules/iterator_support.hpp
 include/pika/modules/itt_notify.hpp
 include/pika/modules/lock_registration.hpp
 include/pika/modules/memory.hpp
-include/pika/modules/prefix.hpp
 include/pika/modules/preprocessor.hpp
 include/pika/modules/program_options.hpp
 include/pika/modules/properties.hpp
@@ -257,8 +255,6 @@ include/pika/modules/type_support.hpp
 include/pika/modules/util.hpp
 include/pika/mpi.hpp
 include/pika/mutex.hpp
-include/pika/prefix/config/defines.hpp
-include/pika/prefix/find_prefix.hpp
 include/pika/preprocessor/cat.hpp
 include/pika/preprocessor/config.hpp
 include/pika/preprocessor/config/defines.hpp
@@ -331,7 +327,6 @@ include/pika/schedulers/static_queue_scheduler.hpp
 include/pika/schedulers/thread_queue.hpp
 include/pika/schedulers/thread_queue_mc.hpp
 include/pika/semaphore.hpp
-include/pika/shared_mutex.hpp
 include/pika/stop_token.hpp
 include/pika/string_util/bad_lexical_cast.hpp
 include/pika/string_util/case_conv.hpp
@@ -359,7 +354,6 @@ include/pika/synchronization/mutex.hpp
 include/pika/synchronization/no_mutex.hpp
 include/pika/synchronization/once.hpp
 include/pika/synchronization/recursive_mutex.hpp
-include/pika/synchronization/shared_mutex.hpp
 include/pika/synchronization/sliding_semaphore.hpp
 include/pika/synchronization/stop_token.hpp
 include/pika/system_error.hpp
@@ -488,7 +482,6 @@ lib/cmake/pika/pika_generate_package.cmake
 lib/cmake/pika/pika_generate_package_utils.cmake
 lib/cmake/pika/pika_git_commit.cmake
 lib/cmake/pika/pika_internal_targets.cmake
-lib/cmake/pika/pika_macros.cmake
 lib/cmake/pika/pika_message.cmake
 lib/cmake/pika/pika_option.cmake
 lib/cmake/pika/pika_perform_cxx_feature_tests.cmake
@@ -542,4 +535,4 @@ lib/cmake/pika/tests/stdexec_sender_receiver_concepts.cpp
 lib/cmake/pika/tests/unistd_h.cpp
 lib/libpika.so
 lib/libpika.so.0
-lib/libpika.so.0.25.0
+lib/libpika.so.0.26.0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407090812.4698CidV017912>