Sat Jun 26 14:08:44 2021 UTC ()
emulators/fs-uae: correct condition for jit and set NOT_PAX_MPROTECT_SAFE


(rhialto)
diff -r1.16 -r1.17 pkgsrc/emulators/fs-uae/Makefile
cvs diff -r1.16 -r1.17 pkgsrc/emulators/fs-uae/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/fs-uae/Makefile 2020/08/18 17:57:46 1.16
+++ pkgsrc/emulators/fs-uae/Makefile 2021/06/26 14:08:44 1.17
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1# $NetBSD: Makefile,v 1.16 2020/08/18 17:57:46 leot Exp $ 1# $NetBSD: Makefile,v 1.17 2021/06/26 14:08:44 rhialto Exp $
2 2
3DISTNAME= fs-uae-3.0.5 3DISTNAME= fs-uae-3.0.5
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= https://fs-uae.net/stable/${PKGVERSION_NOREV}/ 6MASTER_SITES= https://fs-uae.net/stable/${PKGVERSION_NOREV}/
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= https://fs-uae.net/ 9HOMEPAGE= https://fs-uae.net/
10COMMENT= FS-UAE Amiga Emulator 10COMMENT= FS-UAE Amiga Emulator
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_LANGUAGES= c gnu++03 13USE_LANGUAGES= c gnu++03
14USE_TOOLS+= msgfmt pkg-config zip 14USE_TOOLS+= msgfmt pkg-config zip
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --with-libmpeg2 16CONFIGURE_ARGS+= --with-libmpeg2
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
20# See the configure script for the full conditions for whether 20# See the configure script for the full conditions for whether
21# the JIT is supported. 21# the JIT is supported.
22#error JIT is only supported on x86/x86-64 22#error JIT is only supported on x86/x86-64
23#error no JIT on OpenBSD/FreeBSD right now 23#error no JIT on OpenBSD/FreeBSD right now
24.if ${MACHINE_ARCH} != "i386" || \ 24.if (${MACHINE_ARCH} != "i386" && \
25 ${MACHINE_ARCH} != "x86_64" || \ 25 ${MACHINE_ARCH} != "x86_64") || \
26 ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" 26 ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
27CONFIGURE_ARGS+= --disable-jit 27CONFIGURE_ARGS+= --disable-jit
28.else 
29NOT_PAX_MPROTECT_SAFE+= bin/fs-uae 
30.endif 28.endif
 29# Requires paxctl +m even without jit.
 30NOT_PAX_MPROTECT_SAFE+= bin/fs-uae
31 31
32# src/debug.cpp: In function 'void debug()': 32# src/debug.cpp: In function 'void debug()':
33# src/debug.cpp:5361:188: error: array subscript has type 'char' [-Werror=char-subscripts] 33# src/debug.cpp:5361:188: error: array subscript has type 'char' [-Werror=char-subscripts]
34# ... processname[command[0]] == 0 ... 34# ... processname[command[0]] == 0 ...
35# 35#
36# command[0] is the length of a pascal-style string. 36# command[0] is the length of a pascal-style string.
37# This may produce unexpected results with long process names. 37# This may produce unexpected results with long process names.
38BUILDLINK_TRANSFORM+= rm:-Werror=char-subscripts 38BUILDLINK_TRANSFORM+= rm:-Werror=char-subscripts
39 39
40.if ${OPSYS} == "Darwin" 40.if ${OPSYS} == "Darwin"
41#OPENAL_CFLAGS="-framework OpenAL" 41#OPENAL_CFLAGS="-framework OpenAL"
42.else 42.else
43.include "../../audio/openal-soft/buildlink3.mk" 43.include "../../audio/openal-soft/buildlink3.mk"