summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-07-06 10:42:28 +0000
committerwiz <wiz@pkgsrc.org>2013-07-06 10:42:28 +0000
commit24b4442a632a068deb64da39eba3a4a232f02b75 (patch)
treef19b9245c5d6d72648d836cd1ea0fe264b7d9689 /multimedia
parent033812c4b11e0f9be44ec416297472c73c5a07fc (diff)
downloadpkgsrc-24b4442a632a068deb64da39eba3a4a232f02b75.tar.gz
Fix runtime error on NetBSD/i386, from
Onno van der Linden <o.vd.linden@quicknet.nl> 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 (limited to 'multimedia')
-rw-r--r--multimedia/x264-devel/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 7c23d3f54d8..ba751883b52 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -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 @@ LICENSE= gnu-gpl-v2
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 @@ CFLAGS+= -DHAVE_STDLIB_H
(!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