Fri Dec 5 17:09:42 2014 UTC ()
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


(bouyer)
diff -r1.19 -r1.20 pkgsrc/multimedia/ffmpeg010/Makefile
cvs diff -r1.19 -r1.20 pkgsrc/multimedia/ffmpeg010/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg010/Attic/Makefile 2014/08/11 23:09:45 1.19
+++ pkgsrc/multimedia/ffmpeg010/Attic/Makefile 2014/12/05 17:09:42 1.20
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.19 2014/08/11 23:09:45 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2014/12/05 17:09:42 bouyer Exp $
2 2
3PKGNAME= ffmpeg010-20140629.${DISTVERSION} 3PKGNAME= ffmpeg010-20140629.${DISTVERSION}
 4PKGREVISION= 1
4MAINTAINER= pkgsrc-users@NetBSD.org 5MAINTAINER= pkgsrc-users@NetBSD.org
5HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 6HOMEPAGE= http://ffmpeg.mplayerhq.hu/
6COMMENT= Decoding, encoding and streaming software (v0.10) 7COMMENT= Decoding, encoding and streaming software (v0.10)
7LICENSE= gnu-lgpl-v2.1 8LICENSE= gnu-lgpl-v2.1
8 9
9USE_GCC_RUNTIME= yes 10USE_GCC_RUNTIME= yes
10 11
11CONFIGURE_ARGS+= --enable-avfilter 12CONFIGURE_ARGS+= --enable-avfilter
12#CONFIGURE_ARGS+= --enable-avfilter-lavf 13#CONFIGURE_ARGS+= --enable-avfilter-lavf
13CONFIGURE_ARGS+= --enable-postproc 14CONFIGURE_ARGS+= --enable-postproc
14CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg010 15CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg010
15CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg010 16CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg010
16CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg010 17CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg010
@@ -20,37 +21,35 @@ CONFIGURE_ARGS+= --progs-suffix=010 @@ -20,37 +21,35 @@ CONFIGURE_ARGS+= --progs-suffix=010
20 21
21LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg010 22LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg010
22 23
23INSTALLATION_DIRS= lib share/examples/ffmpeg010 share/doc/ffmpeg010 24INSTALLATION_DIRS= lib share/examples/ffmpeg010 share/doc/ffmpeg010
24 25
25CONF_FILES+= ${PREFIX}/share/examples/ffmpeg010/ffserver.conf \ 26CONF_FILES+= ${PREFIX}/share/examples/ffmpeg010/ffserver.conf \
26 ${PKG_SYSCONFDIR}/ffserver.conf 27 ${PKG_SYSCONFDIR}/ffserver.conf
27 28
28.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
29 30
30.include "../../mk/compiler.mk" 31.include "../../mk/compiler.mk"
31 32
32# disable asm on i386 for non-gcc and gcc < 4.2 33# disable asm on i386 for non-gcc and gcc < 4.2
33# no alignment options needed for gcc >= 4.6 on i386 
34 34
35.if ${MACHINE_ARCH} == "i386" 35.if ${MACHINE_ARCH} == "i386"
36.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) 36.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
37CONFIGURE_ARGS+= --disable-asm 37 || !empty(CC_VERSION:Mgcc-[123]*) \
38.elif !empty(CC_VERSION:Mgcc-4.[2345]*) 38 || !empty(CC_VERSION:Mgcc-4.[01].*) \
39CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4 
40.elif !empty(CC_VERSION:Mgcc-[123]*) \ 
41 || !empty(CC_VERSION:Mgcc-4.[01]*) \ 
42 || empty(CC_VERSION:Mgcc*) 39 || empty(CC_VERSION:Mgcc*)
43CONFIGURE_ARGS+= --disable-asm 40CONFIGURE_ARGS+= --disable-asm
 41.elif !empty(CC_VERSION:Mgcc-4.*)
 42CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4
44.endif 43.endif
45.endif 44.endif
46 45
47TEST_TARGET= check 46TEST_TARGET= check
48 47
49post-install: 48post-install:
50 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ 49 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
51 ${DESTDIR}${PREFIX}/share/doc/ffmpeg010 50 ${DESTDIR}${PREFIX}/share/doc/ffmpeg010
52 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ 51 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
53 ${DESTDIR}${PREFIX}/share/examples/ffmpeg010 52 ${DESTDIR}${PREFIX}/share/examples/ffmpeg010
54 53
55.include "options.mk" 54.include "options.mk"
56 55