[pkgsrc/trunk]: pkgsrc/multimedia/x264-devel x264-devel: group together optio...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ae22db7d264
branches:  trunk
changeset: 454531:6ae22db7d264
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jun 13 06:31:50 2021 +0000

description:
x264-devel: group together options to disable ASM

diffstat:

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

diffs (36 lines):

diff -r 0481b2541a30 -r 6ae22db7d264 multimedia/x264-devel/Makefile
--- a/multimedia/x264-devel/Makefile    Sun Jun 13 06:28:17 2021 +0000
+++ b/multimedia/x264-devel/Makefile    Sun Jun 13 06:31:50 2021 +0000
@@ -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 @@
 
 .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