pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/x264-devel Fix runtime error on NetBSD/i386...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5f04fff270e
branches:  trunk
changeset: 621233:d5f04fff270e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jul 06 10:42:28 2013 +0000

description:
Fix runtime error on NetBSD/i386, from
Onno van der Linden <o.vd.linden%quicknet.nl@localhost>
in private mail.

Similar to mplayer and ffmpeg fixes.

XXX: Probably NetBSD-5.99.* could use the CFLAGS too instead
of the --disable-asm, but neither me nor Onno can test.

diffstat:

 multimedia/x264-devel/Makefile |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 0d5e1d991bfe -r d5f04fff270e multimedia/x264-devel/Makefile
--- a/multimedia/x264-devel/Makefile    Sat Jul 06 10:19:31 2013 +0000
+++ b/multimedia/x264-devel/Makefile    Sat Jul 06 10:42:28 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2013/07/04 16:43:55 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2013/07/06 10:42:28 wiz Exp $
 
 SNAPSHOT_DATE= 20130703
 
@@ -19,6 +19,8 @@
 CFLAGS+=       -DHAVE_STDLIB_H
 .endif
 
+.include "../../mk/compiler.mk"
+
 # The assembler implementations don't use position independent code
 # and therefore break the builds on a lot of platforms because we use
 # "libtool" to create shared libraries. We therefore need to switch
@@ -28,6 +30,12 @@
        (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*))) || \
       ${OPSYS} == "Darwin"
 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
 .  else
 BUILD_DEPENDS+=                yasm>=0.4.0:../../devel/yasm
 .  endif



Home | Main Index | Thread Index | Old Index