diff options
| author | nia <nia@pkgsrc.org> | 2021-06-13 06:31:50 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-06-13 06:31:50 +0000 |
| commit | 7777cef0e5c7c84e4c79ebdc127adb8b2ce33c44 (patch) | |
| tree | a362b64963ff69d01aba378e6413da986a38ead2 /multimedia | |
| parent | 16ebad25627938f0a1066166dfe745d82da32a79 (diff) | |
| download | pkgsrc-7777cef0e5c7c84e4c79ebdc127adb8b2ce33c44.tar.gz | |
x264-devel: group together options to disable ASM
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/x264-devel/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index 48b7319bd5c..0c41151d486 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -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 |