From owner-dev-commits-ports-main@freebsd.org Sat Sep 4 04:12:02 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 730A66AB5F1; Sat, 4 Sep 2021 04:12:02 +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 4H1h7k2Gbyz4RrQ; Sat, 4 Sep 2021 04:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 02EAF111A9; Sat, 4 Sep 2021 04:12:02 +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 1844C1XV080590; Sat, 4 Sep 2021 04:12:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1844C1kB080589; Sat, 4 Sep 2021 04:12:01 GMT (envelope-from git) Date: Sat, 4 Sep 2021 04:12:01 GMT Message-Id: <202109040412.1844C1kB080589@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: 987847e500b9 - main - math/oink: Take back BROKEN_i386, instead attempt to fix on i386 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: 987847e500b919e7c9efffffd0b0ab697ecf1ab3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Sep 2021 04:12:02 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=987847e500b919e7c9efffffd0b0ab697ecf1ab3 commit 987847e500b919e7c9efffffd0b0ab697ecf1ab3 Author: Yuri Victorovich AuthorDate: 2021-09-04 04:09:28 +0000 Commit: Yuri Victorovich CommitDate: 2021-09-04 04:09:28 +0000 math/oink: Take back BROKEN_i386, instead attempt to fix on i386 ... by correcting the port patch. It had ifdef(__amd64__) for the mfence() function, but __i386__ was missing. This is likely why it is breaking on i386. --- math/oink/Makefile | 2 -- math/oink/files/patch-src_lace.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/math/oink/Makefile b/math/oink/Makefile index 4e366d421d1d..0acc7592419d 100644 --- a/math/oink/Makefile +++ b/math/oink/Makefile @@ -12,8 +12,6 @@ COMMENT= Modern parity game solvers written in C++ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_i386= error: use of undeclared identifier 'mfence' - LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs USES= cmake:testing diff --git a/math/oink/files/patch-src_lace.h b/math/oink/files/patch-src_lace.h index 86d901ac1df4..f456cff65c0f 100644 --- a/math/oink/files/patch-src_lace.h +++ b/math/oink/files/patch-src_lace.h @@ -4,7 +4,7 @@ #endif #ifndef mfence -+#ifdef __amd64__ ++#if defined(__amd64__) || defined(__i386__) #define mfence() { asm volatile("mfence" ::: "memory"); } +#elif defined(__powerpc__) +#define mfence() { asm volatile("sync" ::: "memory"); }