Received: by mail.netbsd.org (Postfix, from userid 605) id DFBDE84D7A; Sat, 26 Jun 2021 14:08:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2702784CE9 for ; Sat, 26 Jun 2021 14:08:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id WCoYFzHupLdr for ; Sat, 26 Jun 2021 14:08:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 71A3D84CDF for ; Sat, 26 Jun 2021 14:08:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 655D0FA95; Sat, 26 Jun 2021 14:08:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1624716524167980" MIME-Version: 1.0 Date: Sat, 26 Jun 2021 14:08:44 +0000 From: "Olaf Seibert" Subject: CVS commit: pkgsrc/emulators/fs-uae To: pkgsrc-changes@NetBSD.org Reply-To: rhialto@netbsd.org X-Mailer: log_accum Message-Id: <20210626140844.655D0FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1624716524167980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rhialto Date: Sat Jun 26 14:08:44 UTC 2021 Modified Files: pkgsrc/emulators/fs-uae: Makefile Log Message: emulators/fs-uae: correct condition for jit and set NOT_PAX_MPROTECT_SAFE To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/fs-uae/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1624716524167980 Content-Disposition: inline Content-Length: 1297 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/fs-uae/Makefile diff -u pkgsrc/emulators/fs-uae/Makefile:1.16 pkgsrc/emulators/fs-uae/Makefile:1.17 --- pkgsrc/emulators/fs-uae/Makefile:1.16 Tue Aug 18 17:57:46 2020 +++ pkgsrc/emulators/fs-uae/Makefile Sat Jun 26 14:08:44 2021 @@ -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 @@ CONFIGURE_ARGS+= --with-libmpeg2 # 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 -NOT_PAX_MPROTECT_SAFE+= bin/fs-uae .endif +# Requires paxctl +m even without jit. +NOT_PAX_MPROTECT_SAFE+= bin/fs-uae # src/debug.cpp: In function 'void debug()': # src/debug.cpp:5361:188: error: array subscript has type 'char' [-Werror=char-subscripts] --_----------=_1624716524167980--