Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Sep 2021 04:12:01 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 987847e500b9 - main - math/oink: Take back BROKEN_i386, instead attempt to fix on i386
Message-ID:  <202109040412.1844C1kB080589@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=987847e500b919e7c9efffffd0b0ab697ecf1ab3

commit 987847e500b919e7c9efffffd0b0ab697ecf1ab3
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-09-04 04:09:28 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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"); }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109040412.1844C1kB080589>