git: 9c1558d6fe9d - main - devel/pika: Update 0.13.0 → 0.14.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Mon, 10 Apr 2023 03:59:35 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9c1558d6fe9ddecbc9a4cbe51593e6470b13d055

commit 9c1558d6fe9ddecbc9a4cbe51593e6470b13d055
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-04-10 02:22:16 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-04-10 03:59:29 +0000

    devel/pika: Update 0.13.0 → 0.14.0
    
    Reported by:    portscout
---
 devel/pika/Makefile                                 |  2 +-
 devel/pika/distinfo                                 |  6 +++---
 ...include_pika_coroutines_detail_context__impl.hpp | 11 -----------
 ...e_pika_coroutines_detail_context__linux__x86.hpp | 11 -----------
 ...bs_pika_coroutines_src_detail_context__posix.cpp | 11 -----------
 .../patch-libs_pika_coroutines_src_swapcontext.cpp  | 11 -----------
 ...ime_include_pika_init__runtime_init__runtime.hpp | 21 +++++++++++++++++++++
 devel/pika/pkg-plist                                |  7 +++----
 8 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/devel/pika/Makefile b/devel/pika/Makefile
index dce5f1330a95..b1077de97a00 100644
--- a/devel/pika/Makefile
+++ b/devel/pika/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pika
-DISTVERSION=	0.13.0
+DISTVERSION=	0.14.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/pika/distinfo b/devel/pika/distinfo
index 691fc704fc77..2d05e5cb899a 100644
--- a/devel/pika/distinfo
+++ b/devel/pika/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678437453
-SHA256 (pika-org-pika-0.13.0_GH0.tar.gz) = 67e0843141fb711787e71171a7a669c9cdb9587e4afd851ee2b0339a62b9a254
-SIZE (pika-org-pika-0.13.0_GH0.tar.gz) = 1251932
+TIMESTAMP = 1681084705
+SHA256 (pika-org-pika-0.14.0_GH0.tar.gz) = c0fc10a3c2c24bccbdc292c22a3373a2ad579583ee9d8bd31aaf1755e49958a4
+SIZE (pika-org-pika-0.14.0_GH0.tar.gz) = 1255046
diff --git a/devel/pika/files/patch-libs_pika_coroutines_include_pika_coroutines_detail_context__impl.hpp b/devel/pika/files/patch-libs_pika_coroutines_include_pika_coroutines_detail_context__impl.hpp
deleted file mode 100644
index 0ba903912e7a..000000000000
--- a/devel/pika/files/patch-libs_pika_coroutines_include_pika_coroutines_detail_context__impl.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/pika/coroutines/include/pika/coroutines/detail/context_impl.hpp.orig	2023-03-08 10:50:55 UTC
-+++ libs/pika/coroutines/include/pika/coroutines/detail/context_impl.hpp
-@@ -110,7 +110,7 @@ namespace pika { namespace threads { namespace corouti
-     using default_context_impl = generic_context::fcontext_context_impl<CoroutineImpl>;
- }}}}    // namespace pika::threads::coroutines::detail
- 
--#elif (defined(__linux) || defined(linux) || defined(__linux__)) && !defined(__bgq__) &&           \
-+#elif (defined(__linux) || defined(linux) || defined(__linux__) || defined(__FreeBSD__)) && !defined(__bgq__) &&           \
-     !defined(__powerpc__) && !defined(__s390x__) && !defined(__arm__) && !defined(arm64) &&        \
-     !defined(__arm64) && !defined(__arm64__) && !defined(__aarch64__)
- 
diff --git a/devel/pika/files/patch-libs_pika_coroutines_include_pika_coroutines_detail_context__linux__x86.hpp b/devel/pika/files/patch-libs_pika_coroutines_include_pika_coroutines_detail_context__linux__x86.hpp
deleted file mode 100644
index 9f7599c4c634..000000000000
--- a/devel/pika/files/patch-libs_pika_coroutines_include_pika_coroutines_detail_context__linux__x86.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/pika/coroutines/include/pika/coroutines/detail/context_linux_x86.hpp.orig	2023-03-08 10:50:55 UTC
-+++ libs/pika/coroutines/include/pika/coroutines/detail/context_linux_x86.hpp
-@@ -12,7 +12,7 @@
- 
- #pragma once
- 
--#if defined(__linux) || defined(linux) || defined(__linux__)
-+#if defined(__linux) || defined(linux) || defined(__linux__) || defined(__FreeBSD__)
- 
- # include <pika/config.hpp>
- # include <pika/assert.hpp>
diff --git a/devel/pika/files/patch-libs_pika_coroutines_src_detail_context__posix.cpp b/devel/pika/files/patch-libs_pika_coroutines_src_detail_context__posix.cpp
deleted file mode 100644
index 7d648855bc7a..000000000000
--- a/devel/pika/files/patch-libs_pika_coroutines_src_detail_context__posix.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/pika/coroutines/src/detail/context_posix.cpp.orig	2023-03-08 10:50:55 UTC
-+++ libs/pika/coroutines/src/detail/context_posix.cpp
-@@ -14,7 +14,7 @@
- 
- // left empty on purpose
- 
--#elif (defined(__linux) || defined(linux) || defined(__linux__)) && !defined(__bgq__) &&           \
-+#elif (defined(__linux) || defined(linux) || defined(__linux__) || defined(__FreeBSD__)) && !defined(__bgq__) &&           \
-     !defined(__powerpc__) && !defined(__s390x__) && !defined(__arm__) && !defined(__arm64__) &&    \
-     !defined(__aarch64__)
- 
diff --git a/devel/pika/files/patch-libs_pika_coroutines_src_swapcontext.cpp b/devel/pika/files/patch-libs_pika_coroutines_src_swapcontext.cpp
deleted file mode 100644
index a5981955722c..000000000000
--- a/devel/pika/files/patch-libs_pika_coroutines_src_swapcontext.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/pika/coroutines/src/swapcontext.cpp.orig	2023-03-08 10:50:55 UTC
-+++ libs/pika/coroutines/src/swapcontext.cpp
-@@ -9,7 +9,7 @@
- 
- #if !defined(PIKA_HAVE_GENERIC_CONTEXT_COROUTINES)
- 
--# if (defined(__linux) || defined(linux) || defined(__linux__)) && !defined(__bgq__) &&            \
-+# if (defined(__linux) || defined(linux) || defined(__linux__) || defined(__FreeBSD__)) && !defined(__bgq__) &&            \
-      !defined(__powerpc__) && !defined(__s390x__) && !defined(__arm__) && !defined(__arm64__) &&   \
-      !defined(__aarch64__)
- 
diff --git a/devel/pika/files/patch-libs_pika_init__runtime_include_pika_init__runtime_init__runtime.hpp b/devel/pika/files/patch-libs_pika_init__runtime_include_pika_init__runtime_init__runtime.hpp
new file mode 100644
index 000000000000..4312e4a6682c
--- /dev/null
+++ b/devel/pika/files/patch-libs_pika_init__runtime_include_pika_init__runtime_init__runtime.hpp
@@ -0,0 +1,21 @@
+- hack to work around https://github.com/pika-org/pika/issues/649
+
+--- libs/pika/init_runtime/include/pika/init_runtime/init_runtime.hpp.orig	2023-04-10 00:11:12 UTC
++++ libs/pika/init_runtime/include/pika/init_runtime/init_runtime.hpp
+@@ -44,6 +44,7 @@
+ 
+ #if defined(__FreeBSD__)
+ extern PIKA_EXPORT char** freebsd_environ;
++#else
+ extern char** environ;
+ #endif
+ 
+@@ -113,7 +114,7 @@ namespace pika {
+             }
+ 
+ #if defined(__FreeBSD__)
+-            freebsd_environ = environ;
++            //freebsd_environ = environ;
+ #endif
+             // set a handler for std::abort
+             std::signal(SIGABRT, pika::detail::on_abort);
diff --git a/devel/pika/pkg-plist b/devel/pika/pkg-plist
index 8a90a3559d86..2594a64d139d 100644
--- a/devel/pika/pkg-plist
+++ b/devel/pika/pkg-plist
@@ -90,9 +90,7 @@ include/pika/coroutines/detail/combined_tagged_state.hpp
 include/pika/coroutines/detail/context_base.hpp
 include/pika/coroutines/detail/context_generic_context.hpp
 include/pika/coroutines/detail/context_impl.hpp
-include/pika/coroutines/detail/context_impl.hpp.orig
 include/pika/coroutines/detail/context_linux_x86.hpp
-include/pika/coroutines/detail/context_linux_x86.hpp.orig
 include/pika/coroutines/detail/context_posix.hpp
 include/pika/coroutines/detail/context_windows_fibers.hpp
 include/pika/coroutines/detail/coroutine_accessor.hpp
@@ -186,10 +184,10 @@ include/pika/execution_base/context_base.hpp
 include/pika/execution_base/detail/spinlock_deadlock_detection.hpp
 include/pika/execution_base/execution.hpp
 include/pika/execution_base/operation_state.hpp
-include/pika/execution_base/p2300_forward.hpp
 include/pika/execution_base/receiver.hpp
 include/pika/execution_base/resource_base.hpp
 include/pika/execution_base/sender.hpp
+include/pika/execution_base/stdexec_forward.hpp
 include/pika/execution_base/this_thread.hpp
 include/pika/execution_base/traits/is_executor.hpp
 include/pika/execution_base/traits/is_executor_parameters.hpp
@@ -277,6 +275,7 @@ include/pika/init.hpp
 include/pika/init_runtime/config/defines.hpp
 include/pika/init_runtime/detail/init_logging.hpp
 include/pika/init_runtime/init_runtime.hpp
+include/pika/init_runtime/init_runtime.hpp.orig
 include/pika/init_runtime/scoped_finalize.hpp
 include/pika/iterator_support/boost_iterator_categories.hpp
 include/pika/iterator_support/config/defines.hpp
@@ -678,4 +677,4 @@ lib/cmake/pika/tests/stable_inplace_merge.cpp
 lib/cmake/pika/tests/unistd_h.cpp
 lib/libpika.so
 lib/libpika.so.0
-lib/libpika.so.0.13.0
+lib/libpika.so.0.14.0