summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2012-11-09 07:56:26 +0000
committertron <tron@pkgsrc.org>2012-11-09 07:56:26 +0000
commit91145b5d68bf8984cdd6dc9409dd0025524ef52d (patch)
tree4cb26090ae073049de2f8d4f01bf2d6356bc98ee /multimedia/ffmpeg
parentfb8afeedf194d8707a22df93c78df33b2cebd656 (diff)
downloadpkgsrc-91145b5d68bf8984cdd6dc9409dd0025524ef52d.tar.gz
Restore disabling of assembler support under Mac OS X i386 to fix
the build.
Diffstat (limited to 'multimedia/ffmpeg')
-rw-r--r--multimedia/ffmpeg/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 74af87fd22f..d66af96aac5 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2012/11/08 19:57:29 adam Exp $
+# $NetBSD: Makefile,v 1.93 2012/11/09 07:56:26 tron Exp $
PKGNAME= ffmpeg-20121028.${DISTVERSION}
@@ -17,6 +17,10 @@ CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MDarwin-*-i386)
+CONFIGURE_ARGS+= --disable-asm
+.endif
+
# "error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'"
CFLAGS.SunOS+= -DBROKEN_RELOCATIONS=1