diff options
| author | adam <adam@pkgsrc.org> | 2013-08-15 10:21:30 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2013-08-15 10:21:30 +0000 |
| commit | 349cfc2cfd11fcbfebce71ae4d0ca4d74f97dc90 (patch) | |
| tree | 283bb74bcfc46770963dfcf0e7ab219a9986b1cb /multimedia | |
| parent | 93c5d687ce5f5afe8d1521f4b980ecf7f4bbc708 (diff) | |
| download | pkgsrc-349cfc2cfd11fcbfebce71ae4d0ca4d74f97dc90.tar.gz | |
Apply patch from Onno van der Linden to try fixing PR 48116.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg2/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile index 9922873ede8..113afe9b4dd 100644 --- a/multimedia/ffmpeg2/Makefile +++ b/multimedia/ffmpeg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/08/04 10:29:02 adam Exp $ +# $NetBSD: Makefile,v 1.2 2013/08/15 10:21:30 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} MAINTAINER= pkgsrc-users@NetBSD.org @@ -40,13 +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 +CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 . endif .endif |