summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz>2013-06-29 14:53:39 +0000
committerwiz <wiz>2013-06-29 14:53:39 +0000
commit46250c18cedb11b91c6c770a93ffae5d4dc09db2 (patch)
tree467841568337d827c31d6357fc470983995ce165 /multimedia
parent1e579fa63002a0f84eb9ce44b4e640877b1333ef (diff)
downloadpkgsrc-46250c18cedb11b91c6c770a93ffae5d4dc09db2.tar.gz
Do not make assumptions about Darwin's or Solaris' gcc behaving like others.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index d2a19558299..e89038222d1 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2013/06/29 13:34:23 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2013/06/29 14:53:39 wiz Exp $
PKGNAME= ffmpeg-20130510.${DISTVERSION}
PKGREVISION= 2
@@ -41,7 +41,10 @@ post-install:
# no alignment options needed for gcc >= 4.6 on i386
.if ${MACHINE_ARCH} == "i386"
-.if !empty(CC_VERSION:Mgcc-4.[2345]*)
+.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
+ || !empty(MACHINE_PLATFORM:MSunOS-*-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]*) \