<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5fb2e9c758a429f9282b4f1cdad1c1c7813f15ad">https://github.com/macports/macports-ports/commit/5fb2e9c758a429f9282b4f1cdad1c1c7813f15ad</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5fb2e9c758a dispenso: update to 1.3.0, drop patches
</span>5fb2e9c758a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5fb2e9c758a429f9282b4f1cdad1c1c7813f15ad
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue Jun 4 05:51:20 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> dispenso: update to 1.3.0, drop patches
</span>---
devel/dispenso/Portfile | 20 +++---------
...atform.h-add-cpuRelax-for-PowerPC-and-ARM.patch | 37 ----------------------
devel/dispenso/files/0002-no-werror.patch | 23 --------------
3 files changed, 5 insertions(+), 75 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/dispenso/Portfile b/devel/dispenso/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d6a18f772f..69e02bc723d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/dispenso/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/dispenso/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,32 +4,22 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup facebookincubator dispenso 1.2.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup facebookincubator dispenso 1.3.0 v
</span> revision 0
categories devel parallel
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span> description ${name} provides high-performance concurrency, \
enabling highly parallel computation.
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 412d132710d8bc02291ae67b2d84495bba6ee157 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a44d9cf2f9234f5cbdbe4050fd26e63f3266b64955731651adf04dbb7f6b31df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 373883
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 27b566821cd22b8007f1782642343634aa0c69d5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 824afe8d0d36bfd9bc9b1cbe9be89e7f3ed642a3612766d1c99d5f8dfc647c63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 377644
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-platform.h-add-cpuRelax-for-PowerPC-and-ARM.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.cxx_standard 2014
configure.args-append \
-DDISPENSO_BUILD_BENCHMARKS=OFF \
-DDISPENSO_BUILD_TESTS=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *gcc* ${configure.compiler}] && ${configure.build_arch} in [list arm i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/facebookincubator/dispenso/issues/25
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-no-werror.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -latomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/dispenso/files/0001-platform.h-add-cpuRelax-for-PowerPC-and-ARM.patch b/devel/dispenso/files/0001-platform.h-add-cpuRelax-for-PowerPC-and-ARM.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2df7f709a1d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/dispenso/files/0001-platform.h-add-cpuRelax-for-PowerPC-and-ARM.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0c50d907d1321fe374ffdba3b1549114ecff2d9a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 12 Jan 2024 14:46:26 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] platform.h: add cpuRelax for PowerPC and ARM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dispenso/platform.h | 16 +++++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 15 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git dispenso/platform.h dispenso/platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9aa1ca3..728265a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dispenso/platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dispenso/platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,8 +163,22 @@ inline constexpr uintptr_t alignToCacheLine(uintptr_t val) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void cpuRelax() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- asm volatile("pause" ::: "memory");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined __arm64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline void cpuRelax() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ asm volatile("yield" ::: "memory");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined __powerpc__ || defined __POWERPC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ inline void cpuRelax() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ asm volatile("or r27,r27,r27" ::: "memory");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ inline void cpuRelax() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ asm volatile("or 27,27,27" ::: "memory");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// TODO: provide reasonable relax on non-x86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// TODO: provide reasonable relax on other archs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void cpuRelax() {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // x86-arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/dispenso/files/0002-no-werror.patch b/devel/dispenso/files/0002-no-werror.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3afab908b39..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/dispenso/files/0002-no-werror.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dispenso/CMakeLists.txt 2023-12-28 08:49:50.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dispenso/CMakeLists.txt 2024-01-12 15:15:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(dispenso PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $<$<CXX_COMPILER_ID:MSVC>:/W3 /WX>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -pedantic -Wconversion -Wno-sign-conversion -Werror>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -pedantic -Wconversion -Wno-sign-conversion>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(dispenso
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/CMakeLists.txt 2023-12-28 08:49:50.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/CMakeLists.txt 2024-01-12 15:15:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_features(${TEST_NAME} PRIVATE cxx_std_14)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(${TEST_NAME} PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $<$<CXX_COMPILER_ID:MSVC>:/W3 /WX>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -pedantic -Wconversion -Wno-sign-conversion -Werror>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -pedantic -Wconversion -Wno-sign-conversion>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(${TEST_NAME} gmock_main dispenso)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtest_discover_tests(${TEST_NAME}
</span></pre><pre style='margin:0'>
</pre>