Sun Apr 13 07:41:49 2014 UTC ()
Restore -fno-integrated-as, only for NetBSD.


(wiz)
diff -r1.42 -r1.43 pkgsrc/multimedia/libvpx/Makefile
cvs diff -r1.42 -r1.43 pkgsrc/multimedia/libvpx/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/Makefile 2014/04/12 19:06:55 1.42
+++ pkgsrc/multimedia/libvpx/Makefile 2014/04/13 07:41:49 1.43
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.42 2014/04/12 19:06:55 adam Exp $ 1# $NetBSD: Makefile,v 1.43 2014/04/13 07:41:49 wiz Exp $
2 2
3DISTNAME= libvpx_1.3.0.orig 3DISTNAME= libvpx_1.3.0.orig
4PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} 4PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/libv/libvpx/} 6MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/libv/libvpx/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= http://code.google.com/p/webm/ 10HOMEPAGE= http://code.google.com/p/webm/
11COMMENT= On2 VP8 library from Google 11COMMENT= On2 VP8 library from Google
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
@@ -71,26 +71,30 @@ CONFIGURE_ARGS+= --target=x86_64-darwin9 @@ -71,26 +71,30 @@ CONFIGURE_ARGS+= --target=x86_64-darwin9
71. endif 71. endif
72. elif ${MACHINE_ARCH} == "powerpc" 72. elif ${MACHINE_ARCH} == "powerpc"
73. if !empty(OS_VERSION:M9.*) 73. if !empty(OS_VERSION:M9.*)
74CONFIGURE_ARGS+= --target=ppc32-darwin9-gcc 74CONFIGURE_ARGS+= --target=ppc32-darwin9-gcc
75. else 75. else
76CONFIGURE_ARGS+= --target=ppc32-darwin8-gcc 76CONFIGURE_ARGS+= --target=ppc32-darwin8-gcc
77. endif 77. endif
78. endif 78. endif
79.endif 79.endif
80 80
81.include "../../mk/compiler.mk" 81.include "../../mk/compiler.mk"
82.if !empty(PKGSRC_COMPILER:Mclang) 82.if !empty(PKGSRC_COMPILER:Mclang)
83CXXFLAGS+= -std=c++11 83CXXFLAGS+= -std=c++11
 84.if ${OPSYS} == "NetBSD"
 85# https://bugzilla.mozilla.org/show_bug.cgi?id=982693
 86CFLAGS+= -fno-integrated-as
 87.endif
84.endif 88.endif
85 89
86.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipsel" 90.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipsel"
87CONFIGURE_ARGS+= --target=mips32-linux-gcc 91CONFIGURE_ARGS+= --target=mips32-linux-gcc
88.endif 92.endif
89 93
90.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) 94.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
91CONFIGURE_ARGS+= --disable-runtime-cpu-detect 95CONFIGURE_ARGS+= --disable-runtime-cpu-detect
92.endif 96.endif
93 97
94.if ${OPSYS} == "MirBSD" 98.if ${OPSYS} == "MirBSD"
95BUILDLINK_TRANSFORM+= rm:-lrt 99BUILDLINK_TRANSFORM+= rm:-lrt
96# Compiler is too old for these newfangled features 100# Compiler is too old for these newfangled features