Received: by mail.netbsd.org (Postfix, from userid 605) id 743F684CE1; Sun, 28 Jun 2020 16:34:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F2FA884CDC for ; Sun, 28 Jun 2020 16:33:59 +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 iA2Yarlr4Ccl for ; Sun, 28 Jun 2020 16:33:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4D75284C6C for ; Sun, 28 Jun 2020 16:33:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EC6FBFB28; Sun, 28 Jun 2020 16:33:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159336203868340" MIME-Version: 1.0 Date: Sun, 28 Jun 2020 16:33:58 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/emulators/mame To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200628163358.EC6FBFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159336203868340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun Jun 28 16:33:58 UTC 2020 Modified Files: pkgsrc/emulators/mame: Makefile Log Message: mame: work around failures on aarch64 To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 pkgsrc/emulators/mame/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159336203868340 Content-Disposition: inline Content-Length: 911 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/mame/Makefile diff -u pkgsrc/emulators/mame/Makefile:1.115 pkgsrc/emulators/mame/Makefile:1.116 --- pkgsrc/emulators/mame/Makefile:1.115 Tue Jun 2 08:23:46 2020 +++ pkgsrc/emulators/mame/Makefile Sun Jun 28 16:33:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.115 2020/06/02 08:23:46 adam Exp $ +# $NetBSD: Makefile,v 1.116 2020/06/28 16:33:58 nia Exp $ DISTNAME= mame-0.220 PKGREVISION= 2 @@ -36,6 +36,13 @@ MAKE_ENV+= LDOPTS="${COMPILER_RPATH_FLAG MAKE_ENV+= LDOPTS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.flac}/lib -L${BUILDLINK_PREFIX.flac}/lib" .endif +.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" +# \todo Arch detection for aarch64 fails, investigate why +MAKE_FLAGS+= NOASM=1 +BUILDLINK_TRANSFORM+= rm:-m32 +BUILDLINK_TRANSFORM+= rm:-m64 +.endif + # -Werror is problematic MAKE_ENV= NOWERROR=1 # on Darwin, avoid SDL2.framework --_----------=_159336203868340--