Received: by mail.netbsd.org (Postfix, from userid 605) id 30AF584E40; Wed, 25 Apr 2018 19:25:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2590384E05 for ; Wed, 25 Apr 2018 19:25:13 +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 jiaQrWWnw2Gw for ; Wed, 25 Apr 2018 19:25:12 +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 4D94084C77 for ; Wed, 25 Apr 2018 19:25:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 43F17FBEC; Wed, 25 Apr 2018 19:25:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_15246843126600" MIME-Version: 1.0 Date: Wed, 25 Apr 2018 19:25:12 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/multimedia/x264-devel To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20180425192512.43F17FBEC@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. --_----------=_15246843126600 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Wed Apr 25 19:25:12 UTC 2018 Modified Files: pkgsrc/multimedia/x264-devel: Makefile Log Message: multimedia/x264-devel: Go back to disabled assembler on SunOS, fixes build. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 pkgsrc/multimedia/x264-devel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_15246843126600 Content-Disposition: inline Content-Length: 915 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/x264-devel/Makefile diff -u pkgsrc/multimedia/x264-devel/Makefile:1.65 pkgsrc/multimedia/x264-devel/Makefile:1.66 --- pkgsrc/multimedia/x264-devel/Makefile:1.65 Sun Feb 25 21:57:43 2018 +++ pkgsrc/multimedia/x264-devel/Makefile Wed Apr 25 19:25:12 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2018/02/25 21:57:43 adam Exp $ +# $NetBSD: Makefile,v 1.66 2018/04/25 19:25:12 fhajny Exp $ DISTNAME= x264-snapshot-20180224-2245 PKGNAME= ${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//} @@ -13,7 +13,10 @@ LICENSE= gnu-gpl-v2 .include "../../mk/bsd.prefs.mk" -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +# Assembler code still needs to be disabled on at least SunOS +.if ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --disable-asm +.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" BUILD_DEPENDS+= nasm>=2.13.0:../../devel/nasm .endif --_----------=_15246843126600--