summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authortron <tron>2015-04-09 17:09:01 +0000
committertron <tron>2015-04-09 17:09:01 +0000
commit7e60536f4d1e32c82add914b619ff8abf71377de (patch)
treebb4b98b7794f1e996a0522932c780568486979fc /multimedia
parent9814421a4bfb159fb6b7d7e5b0067a4d254121f1 (diff)
downloadpkgsrc-7e60536f4d1e32c82add914b619ff8abf71377de.tar.gz
Improve Clang build fix and use it under Mac OS X as well. The problem
is specific to the verion of Clang (3.5 and newer) and not the platform. This package now builds under Mac OS X Yosemite with the latest version of Xcode tools.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/libvpx/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 919905a7af0..078352dad14 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2015/02/25 11:13:54 adam Exp $
+# $NetBSD: Makefile,v 1.52 2015/04/09 17:09:01 tron Exp $
DISTNAME= libvpx_1.3.0.orig
PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
@@ -93,9 +93,12 @@ CONFIGURE_ARGS+= --target=x86-solaris-gcc
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
CXXFLAGS+= -std=c++11
-. if ${OPSYS} == "NetBSD"
+. if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"
# https://bugzilla.mozilla.org/show_bug.cgi?id=982693
-CFLAGS+= -fno-integrated-as
+SUBST_CLASSES+= clang
+SUBST_STAGE.clang= post-patch
+SUBST_FILES.clang= build/make/Makefile
+SUBST_SED.clang= -e 's/-DINLINE_ASM/-DINLINE_ASM -fno-integrated-as/'
. endif
.endif