summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorbouyer <bouyer@pkgsrc.org>2014-12-05 17:09:42 +0000
committerbouyer <bouyer@pkgsrc.org>2014-12-05 17:09:42 +0000
commitbcb22416b01c5ccbd80bdf7ceb39ec14a23d258c (patch)
treed227756d4a9dad13d538c3e413351c6057d59539 /multimedia
parentacf51160fb7f602b029f0976aa2297aa8a2470e6 (diff)
downloadpkgsrc-bcb22416b01c5ccbd80bdf7ceb39ec14a23d258c.tar.gz
Add -mstackrealign -mpreferred-stack-boundary=4 to CFLAGS on i386 for all
gcc 4.x versions, this appears to still be needed with gcc 4.8.4. From John D. Baker
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg010/Makefile15
1 files changed, 7 insertions, 8 deletions
diff --git a/multimedia/ffmpeg010/Makefile b/multimedia/ffmpeg010/Makefile
index 3f7c90888fd..8611de9baae 100644
--- a/multimedia/ffmpeg010/Makefile
+++ b/multimedia/ffmpeg010/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2014/08/11 23:09:45 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2014/12/05 17:09:42 bouyer Exp $
PKGNAME= ffmpeg010-20140629.${DISTVERSION}
+PKGREVISION= 1
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
COMMENT= Decoding, encoding and streaming software (v0.10)
@@ -30,17 +31,15 @@ CONF_FILES+= ${PREFIX}/share/examples/ffmpeg010/ffserver.conf \
.include "../../mk/compiler.mk"
# disable asm on i386 for non-gcc and gcc < 4.2
-# no alignment options needed for gcc >= 4.6 on i386
.if ${MACHINE_ARCH} == "i386"
-.if !empty(MACHINE_PLATFORM:MDarwin-*-i386)
-CONFIGURE_ARGS+= --disable-asm
-.elif !empty(CC_VERSION:Mgcc-4.[2345]*)
-CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4
-.elif !empty(CC_VERSION:Mgcc-[123]*) \
- || !empty(CC_VERSION:Mgcc-4.[01]*) \
+.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
+ || !empty(CC_VERSION:Mgcc-[123]*) \
+ || !empty(CC_VERSION:Mgcc-4.[01].*) \
|| empty(CC_VERSION:Mgcc*)
CONFIGURE_ARGS+= --disable-asm
+.elif !empty(CC_VERSION:Mgcc-4.*)
+CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4
.endif
.endif