[pkgsrc/trunk]: pkgsrc/emulators/fs-uae emulators/fs-uae: correct condition f...

[rhialto <rhialto%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc9461e5c2a1
branches:  trunk
changeset: 455026:dc9461e5c2a1
user:      rhialto <rhialto%pkgsrc.org@localhost>
date:      Sat Jun 26 14:08:44 2021 +0000

description:
emulators/fs-uae: correct condition for jit and set NOT_PAX_MPROTECT_SAFE

diffstat:

 emulators/fs-uae/Makefile |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (32 lines):

diff -r 005f5e54206d -r dc9461e5c2a1 emulators/fs-uae/Makefile
--- a/emulators/fs-uae/Makefile Sat Jun 26 13:51:55 2021 +0000
+++ b/emulators/fs-uae/Makefile Sat Jun 26 14:08:44 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2020/08/18 17:57:46 leot Exp $
+# $NetBSD: Makefile,v 1.17 2021/06/26 14:08:44 rhialto Exp $
 
 DISTNAME=      fs-uae-3.0.5
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    emulators
 MASTER_SITES=  https://fs-uae.net/stable/${PKGVERSION_NOREV}/
 
@@ -21,13 +21,13 @@
 # the JIT is supported.
 #error JIT is only supported on x86/x86-64
 #error no JIT on OpenBSD/FreeBSD right now
-.if ${MACHINE_ARCH} != "i386" || \
-    ${MACHINE_ARCH} != "x86_64" || \
-    ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
+.if (${MACHINE_ARCH} != "i386" && \
+     ${MACHINE_ARCH} != "x86_64") || \
+    ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=       --disable-jit
-.else
+.endif
+# Requires paxctl +m even without jit.
 NOT_PAX_MPROTECT_SAFE+=        bin/fs-uae
-.endif
 
 # src/debug.cpp: In function 'void debug()':
 # src/debug.cpp:5361:188: error: array subscript has type 'char' [-Werror=char-subscripts]