diff options
| author | wiz <wiz> | 2013-08-14 17:54:06 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2013-08-14 17:54:06 +0000 |
| commit | 07174dea136d59c884272771a5a8bba823ef2dfd (patch) | |
| tree | 055762c52de05d80ba1d84e44f28d165329ec67c | |
| parent | 9c1751d6e4a34a3f7f89c501eea59951544ac05c (diff) | |
| download | pkgsrc-07174dea136d59c884272771a5a8bba823ef2dfd.tar.gz | |
Apply patch from Onno van der Linden to try fixing PR 48116.
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 6a76ceadc60..326738a91e0 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.112 2013/08/02 18:24:18 adam Exp $ +# $NetBSD: Makefile,v 1.113 2013/08/14 17:54:06 wiz Exp $ PKGNAME= ffmpeg-20130728.${DISTVERSION} MAINTAINER= pkgsrc-users@NetBSD.org @@ -40,14 +40,13 @@ post-install: # no alignment options needed for gcc >= 4.6 on i386 .if ${MACHINE_ARCH} == "i386" . if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \ - || !empty(MACHINE_PLATFORM:MSunOS-*-i386) + || !empty(MACHINE_PLATFORM:MSunOS-*-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.[2345]*) CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 -. elif !empty(CC_VERSION:Mgcc-[123]*) \ - || !empty(CC_VERSION:Mgcc-4.[01]*) \ - || empty(CC_VERSION:Mgcc*) -CONFIGURE_ARGS+= --disable-asm . endif .endif |