CVS commit: pkgsrc/multimedia/x264-devel

["Filip Hajny" <fhajny%netbsd.org@localhost>]

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.

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