diff options
author | fhajny <fhajny@pkgsrc.org> | 2018-04-25 19:25:12 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2018-04-25 19:25:12 +0000 |
commit | 41b7c4ef7a41a470a7caae1043c06264767403b3 (patch) | |
tree | 592975d90ec0ea08a33b9054be7a36f1d5ff5e76 | |
parent | c0e45513eb5ac194cda0754ab26af74d762fd3b9 (diff) | |
download | pkgsrc-41b7c4ef7a41a470a7caae1043c06264767403b3.tar.gz |
multimedia/x264-devel: Go back to disabled assembler on SunOS, fixes build.
-rw-r--r-- | multimedia/x264-devel/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index c32eb8b8e9b..a3c4ff92365 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -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 |