summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2012-12-19 11:59:35 +0000
committerjperkin <jperkin@pkgsrc.org>2012-12-19 11:59:35 +0000
commit4ef74cc74456174254b0fa587db7b9972a89753a (patch)
tree3ad5a5dd35f030da96140cc0d3bc91e6f57ae5b7 /multimedia
parent791f4e9f0b2bd1b417bc9707d9610618afd4df00 (diff)
downloadpkgsrc-4ef74cc74456174254b0fa587db7b9972a89753a.tar.gz
Fully disable assembly on Solaris 32-bit to avoid GENERAL_REGS errors.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index dbcb46927ca..640d561a1d3 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2012/12/16 13:43:10 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2012/12/19 11:59:35 jperkin Exp $
PKGNAME= ffmpeg-20121209.${DISTVERSION}
@@ -17,13 +17,11 @@ CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
.include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_PLATFORM:MDarwin-*-i386)
+.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
+ || !empty(MACHINE_PLATFORM:MSunOS-*-i386)
CONFIGURE_ARGS+= --disable-asm
.endif
-# "error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'"
-CFLAGS.SunOS+= -DBROKEN_RELOCATIONS=1
-
TEST_TARGET= check
post-install: