CVS commit: pkgsrc/multimedia/x264-devel

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 13 06:31:50 UTC 2021

Modified Files:
        pkgsrc/multimedia/x264-devel: Makefile

Log Message:
x264-devel: group together options to disable ASM


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 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.77 pkgsrc/multimedia/x264-devel/Makefile:1.78
--- pkgsrc/multimedia/x264-devel/Makefile:1.77  Sun Jun 13 06:28:17 2021
+++ pkgsrc/multimedia/x264-devel/Makefile       Sun Jun 13 06:31:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2021/06/13 06:28:17 nia Exp $
+# $NetBSD: Makefile,v 1.78 2021/06/13 06:31:50 nia Exp $
 
 DISTNAME=      x264-snapshot-20191217-2245
 PKGNAME=       ${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//}
@@ -14,20 +14,18 @@ LICENSE=    gnu-gpl-v2
 
 .include "../../mk/bsd.prefs.mk"
 
-# Assembler code still needs to be disabled on at least SunOS
-# Also needs to avoid text relocations caused by non-pie x86 asm on NetBSD/i386
+# Assembler code still needs to be disabled on at least SunOS.
+# NetBSD/i386 needs ASM disabled to avoid text relocations.
+# NetBSD/mips needs ASM disabled because it uses the MSA extension
+# (requires MIPS64 revision 2) and fails to build.
 .if ${OPSYS} == "SunOS" || \
-    !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
+    !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
+    !empty(MACHINE_PLATFORM:MNetBSD-*-mips*)
 CONFIGURE_ARGS+=       --disable-asm
 .elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 TOOL_DEPENDS+=         nasm>=2.13.0:../../devel/nasm
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-mips*)
-# error: unknown type name 'v8i16'
-CONFIGURE_ARGS+=       --disable-asm
-.endif
-
 USE_TOOLS+=            bash gmake
 USE_LIBTOOL=           yes
 HAS_CONFIGURE=         yes