From nobody Sun Mar 13 02:27:27 2022 X-Original-To: dev-commits-ports-main@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 0CA091A22228; Sun, 13 Mar 2022 02:27:28 +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 4KGNqM6J8rz4sgs; Sun, 13 Mar 2022 02:27:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647138447; 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=A00M/eVEAoBPfzYYHcZcbiqMxLMhL8KnG5fzCUvNDBE=; b=Gf4YfPoismoHe3mY0oMvliIHl/CqPgbUatTNF4NfTLptJU0z9VKTvqjig1/GfDqDvTlWXV kLPQA6dMkUs7VMfsuMTcm/nvmXH61YrOcH0UGoiuYZvSRpBxlFSZqwxvv0QAiW6v/GmYnP CFqUxwD8YeG6WZYbSBmyWDG1AohGtkw4pnSKMtW7TKhx1GMY1GTS2DOcAyQLui471kg+Qz /XaqDXNiIHP1RDBc4T91ooFn9bCjZzFE9/t8n/xF6U0i7fEjJgbbciW3xoDEv21xx6wQsV 2uut7HY5nBFF3itLK8isDOnw1W84kcZr/s8WdkGSrV0BZPTkepFDUlHgHMaL9g== 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 B7D9310F38; Sun, 13 Mar 2022 02:27:27 +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 22D2RRRN021562; Sun, 13 Mar 2022 02:27:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22D2RRSP021561; Sun, 13 Mar 2022 02:27:27 GMT (envelope-from git) Date: Sun, 13 Mar 2022 02:27:27 GMT Message-Id: <202203130227.22D2RRSP021561@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: de445d5dd99c - main - math/oink: Update g20210704 -> g20210710 and make atomics portable List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: de445d5dd99c6b2d2188f7f25d41c871a14e12db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647138447; 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=A00M/eVEAoBPfzYYHcZcbiqMxLMhL8KnG5fzCUvNDBE=; b=C1JnzfT3czkWY+ba+fWVx6wNr+6FqH0w6t8qQUBeGlDbcrFoFXrW9qr7JNbKVql0SiQeWv M2JALF73LHfamIS44uNvquQiV5PYgwxjzcE12jtpaAB5LU9G5aoEVTevtn9ClIC61xGaUW ijAnbpRGyPyBVv0q5balYkcS9AFVFEIpmi6Q9aqflctagQOKd17GsYUFWspcmeK7iWeqDg DHAUPUR55eNnRx/l0pssLG0xyZLm/8LRLPUdwoY4z3B0+KvRphsMHpyLQfHHGEI8R6CqJb fQu4buw9MFg7ISQaW+P15IhjxcaBLNlyUyU6UjFu3xrLlKUvh1WB50vBqdv27g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647138447; a=rsa-sha256; cv=none; b=WDZTxP0VJCssL2NQw1AjHbkmPyqOYtckvYeqsWIWEOakqqRnfmJBuJ+p6aNapHuDL4xLnE z2nlGwpQDVIoQ7/OqxLNaNBMdkJqrWWNPIJf8i+7Hfu2XRMS6DaAVt2Qz9A92cELPXmmth hcbu0dS2FtvM+tRAqH3l+Uy9d7hQCINLy3wS2vdKCkdsOd2o1mMqpuhew+F+NunWk0hKMo 7VTnShuOuq6DByACZe730revY1xXnDQW5qd+kcrov4jTQ+Dfuc2z9ihpNj+46RGDghfSdI L3J0LMEbHkBZ7uuxdbKklNXx4aDnqhvPorDDtloDyE8G+1ZJFaiDVmEb6C1QaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=de445d5dd99c6b2d2188f7f25d41c871a14e12db commit de445d5dd99c6b2d2188f7f25d41c871a14e12db Author: Robert Clausecker AuthorDate: 2022-03-13 02:26:31 +0000 Commit: Yuri Victorovich 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 ++#ifdef __cplusplus ++#include ++#else ++#include ++#endif + #include + #include + #include /* 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