summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-07-06 21:57:45 +0000
committerwiz <wiz@pkgsrc.org>2013-07-06 21:57:45 +0000
commit6b80ae2d229ce8d0aea06a3d33e41aca1776e230 (patch)
treed55dded43c1bb6c932a74f1571191efe7df887e8 /multimedia
parentddf99afc369fa38ecfa981bcc7e84f28ae3c84f5 (diff)
downloadpkgsrc-6b80ae2d229ce8d0aea06a3d33e41aca1776e230.tar.gz
Backout previous.
Onno van der Linden reports it is not needed any longer with x264-devel-20130703.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/x264-devel/Makefile10
1 files changed, 1 insertions, 9 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index ba751883b52..1216acd956a 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2013/07/06 10:42:28 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2013/07/06 21:57:45 wiz Exp $
SNAPSHOT_DATE= 20130703
@@ -19,8 +19,6 @@ 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
@@ -30,12 +28,6 @@ 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