From nobody Mon Apr 10 03:59:35 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvwGJ0dmnz44jfJ; Mon, 10 Apr 2023 03:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PvwGH5chdz3xkL; Mon, 10 Apr 2023 03:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681099175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4uCWMGTuHbno0S0kBsGau4GDJkEwZgVvYaNCJ0ZpGtw=; b=DL/2kFzIfhJwURpqwEwrAnDDVsB0pUX992ONsQp3/bsdXWXqfly82yy8aB1J+dkRXGcUF1 EVpOuhEF5b2/qFR4CfgXnhPlNj8W5oZXLvBsWj05FMt6DmvK5XEkSrOFSWKPpaFvnvbCe5 8Cy6FtYUQXHrupgyZJUi9iKh/pO+2cBpasefbjSU+OY1rAgyFod940rWKQJIJ0+6wAn/ZK IebZeiJ9BbpMTQL6hb40ucmwVA/Q0kYTe9BBWyLcfoXHJEF3QJ4LOxvCPMMPHKO0A8E0ko BYmksO0g2wjJgx/Z4kuRyA+4pPiyWZSXJFx/8ao9P0DZ1D7py9D6KTQJBUTgEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681099175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4uCWMGTuHbno0S0kBsGau4GDJkEwZgVvYaNCJ0ZpGtw=; b=niqXKXJl98wfaIne4OtKPttILzNs2O/9H/Uz8doSc97NxtwGAtp2e1AlCUB3vI6GQ9Tajc eDR1wo4KamEp5RysSY9+ibS6MV6Zk7CbZg98BGV2glSbX1Gxu/MS+u9cjoxc5XCXoFoK3m 2y3B3dOMg8501n2Jt713FbxPzzmxJjMC6kB4BD42nCe1mZVdUhEo6FzOyHJ+RYjQ0icACd jzwhzH7xMb1WZPF7/BXw8Um1Ag1bAKPCEx/zHxudJnrbheUF5F0t+duuBPc/D/LDKPb1zy lDqEtOmfmQEIAG9t2tkOvwqHjqPEaeGQz0b8YyljDG/FiDegCDRcnbbcW0Ct6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681099175; a=rsa-sha256; cv=none; b=GbbTmgq/CUcr6Hbt9EougTsnHEg2CkukAb6zvMTMw1l8NvvTedyCBJGC9jDX3S4159SOeI sOK4Hh6HUsYBorB5u1v9dzThYvvxGNqDCr8gQlCtdGYFQz5FlnHk0PkM0jw07zmH29euIZ ZyVRUivfbA/HtPRLtXmNwpA6saeKK4H/OU1daQ3qBQAs9r9D9958av+OSR/bE2UaedKeZ6 9dnWSMbtQLjADRr2Hwa02FAeDLugW4cdC61heuu2MGwoydlnJk81sXOOD1omU4WYWSJ+ad rBnhJbyGAwhIG46nxldrVkya9uBdIYEAzYEIr25S3gpPM7MpdH/hXEszNfxBGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PvwGH4WPlzbQG; Mon, 10 Apr 2023 03:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33A3xZqO006161; Mon, 10 Apr 2023 03:59:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33A3xZMf006160; Mon, 10 Apr 2023 03:59:35 GMT (envelope-from git) Date: Mon, 10 Apr 2023 03:59:35 GMT Message-Id: <202304100359.33A3xZMf006160@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 9c1558d6fe9d - main - =?utf-8?Q?devel/pika:=20Update=200.13.0=20=E2=86=92=200.14.0?= List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c1558d6fe9ddecbc9a4cbe51593e6470b13d055 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c1558d6fe9ddecbc9a4cbe51593e6470b13d055 commit 9c1558d6fe9ddecbc9a4cbe51593e6470b13d055 Author: Yuri Victorovich AuthorDate: 2023-04-10 02:22:16 +0000 Commit: Yuri Victorovich 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; - }}}} // 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 - # include 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