git: de445d5dd99c - main - math/oink: Update g20210704 -> g20210710 and make atomics portable
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 13 Mar 2022 02:27:27 UTC
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=de445d5dd99c6b2d2188f7f25d41c871a14e12db commit de445d5dd99c6b2d2188f7f25d41c871a14e12db Author: Robert Clausecker <fuz@fuz.su> AuthorDate: 2022-03-13 02:26:31 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2022-03-13 02:27:25 +0000 math/oink: Update g20210704 -> g20210710 and make atomics portable PR: 262513 --- math/oink/Makefile | 9 ++------- math/oink/distinfo | 10 +++------- math/oink/files/patch-src_lace.h | 25 +++++++++++++++++++------ 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/math/oink/Makefile b/math/oink/Makefile index 38eefe3d4458..29fba7b5f333 100644 --- a/math/oink/Makefile +++ b/math/oink/Makefile @@ -1,12 +1,7 @@ PORTNAME= oink -DISTVERSION= g20210704 -PORTREVISION= 1 +DISTVERSION= g20210710 CATEGORIES= math -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ -PATCHFILES= cd8c62bc1900ffee6d933fa31cbdd954560c286b.patch:-p1 # Fix build on FreeBSD -PATCHFILES+= a5c10784a472c42bab5a4df0ef29799011bc30b1.patch:-p1 # Fix installed cmake file path - MAINTAINER= yuri@FreeBSD.org COMMENT= Modern parity game solvers written in C++ @@ -20,7 +15,7 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= trolando -GH_TAGNAME= c1259fe +GH_TAGNAME= 3327c54 CMAKE_ON= BUILD_SHARED_LIBS diff --git a/math/oink/distinfo b/math/oink/distinfo index 00defc2aa940..3eeb22aa1ac0 100644 --- a/math/oink/distinfo +++ b/math/oink/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1625512740 -SHA256 (trolando-oink-g20210704-c1259fe_GH0.tar.gz) = 46f6b06f905ea94efadf2adce3923ed7df2775f9101e505eebe787b7b94e5549 -SIZE (trolando-oink-g20210704-c1259fe_GH0.tar.gz) = 178173 -SHA256 (cd8c62bc1900ffee6d933fa31cbdd954560c286b.patch) = eb88af6421600c8538f229369412289a46a87be3a6c4419642d02b4841453325 -SIZE (cd8c62bc1900ffee6d933fa31cbdd954560c286b.patch) = 764 -SHA256 (a5c10784a472c42bab5a4df0ef29799011bc30b1.patch) = 4b103ff0fe318e97ea370ce1c82b91ddbb998f5266d340306138b9a41487bea8 -SIZE (a5c10784a472c42bab5a4df0ef29799011bc30b1.patch) = 796 +TIMESTAMP = 1647124747 +SHA256 (trolando-oink-g20210710-3327c54_GH0.tar.gz) = 5c4f1658531fcfca394cb46412143ccebc70153953d398942609b18f999a136a +SIZE (trolando-oink-g20210710-3327c54_GH0.tar.gz) = 178207 diff --git a/math/oink/files/patch-src_lace.h b/math/oink/files/patch-src_lace.h index f456cff65c0f..58b02f30be38 100644 --- a/math/oink/files/patch-src_lace.h +++ b/math/oink/files/patch-src_lace.h @@ -1,13 +1,26 @@ ---- src/lace.h.orig 2021-07-12 11:27:04 UTC +--- src/lace.h.orig 2021-07-10 20:56:55 UTC +++ src/lace.h -@@ -293,7 +293,11 @@ void lace_yield(WorkerP *__lace_worker, Task *__lace_d +@@ -17,6 +17,11 @@ + */ + + #include <unistd.h> ++#ifdef __cplusplus ++#include <atomic> ++#else ++#include <stdatomic.h> ++#endif + #include <stdint.h> + #include <stdio.h> + #include <pthread.h> /* for pthread_t */ +@@ -293,7 +298,11 @@ void lace_yield(WorkerP *__lace_worker, Task *__lace_d #endif #ifndef mfence -+#if defined(__amd64__) || defined(__i386__) - #define mfence() { asm volatile("mfence" ::: "memory"); } -+#elif defined(__powerpc__) -+#define mfence() { asm volatile("sync" ::: "memory"); } +-#define mfence() { asm volatile("mfence" ::: "memory"); } ++#ifdef __cplusplus ++#define mfence() std::atomic_thread_fence(std::memory_order_seq_cst) ++#else ++#define mfence() atomic_thread_fence(memory_order_seq_cst) +#endif #endif