[pkgsrc/trunk]: pkgsrc/multimedia/x264-devel multimedia/x264-devel: Go back t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cdcf5e119562
branches:  trunk
changeset: 379189:cdcf5e119562
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Wed Apr 25 19:25:12 2018 +0000

description:
multimedia/x264-devel: Go back to disabled assembler on SunOS, fixes build.

diffstat:

 multimedia/x264-devel/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r f5e66b16b3bf -r cdcf5e119562 multimedia/x264-devel/Makefile
--- a/multimedia/x264-devel/Makefile    Wed Apr 25 16:44:01 2018 +0000
+++ b/multimedia/x264-devel/Makefile    Wed Apr 25 19:25:12 2018 +0000
@@ -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 @@
 
 .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