summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-10-25 12:43:45 +0000
committernia <nia@pkgsrc.org>2020-10-25 12:43:45 +0000
commit1c1e127bf258cb592c3df4fb3e7aa70ac6b5496e (patch)
tree31b531eb0cabe8f8212090fa54558220dfc9579f /multimedia
parent569b1f5032ce29f13433cad4530f72b3e11f7afe (diff)
downloadpkgsrc-1c1e127bf258cb592c3df4fb3e7aa70ac6b5496e.tar.gz
libvpx: Set compiler requirements properly.
Needs at least gcc 4.8, does not need c++11 in USE_LANGUAGES because it sets -std=c++11 itself.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/libvpx/Makefile15
-rw-r--r--multimedia/libvpx/buildlink3.mk4
2 files changed, 9 insertions, 10 deletions
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 4c7f2473cc9..d525c0bbcc8 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2020/09/29 13:03:13 adam Exp $
+# $NetBSD: Makefile,v 1.85 2020/10/25 12:43:45 nia Exp $
DISTNAME= libvpx-1.9.0
PKGREVISION= 1
@@ -12,7 +12,7 @@ HOMEPAGE= https://chromium.googlesource.com/webm/libvpx
COMMENT= On2 VP8 library from Google
LICENSE= modified-bsd
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= gmake bash:build perl:build
HAS_CONFIGURE= yes
@@ -23,16 +23,13 @@ CONFIGURE_ARGS+= --enable-runtime-cpu-detect
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --disable-unit-tests
+# Uses -std=c++11
+GCC_REQD+= 4.8
+
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-# PR pkg/48508: GCC 4.4 or later is required to compile ssse3 code on NetBSD & Solaris.
-# Because building pkgsrc with gcc < 4.4 doesn't really work in the
-# first place, for simplicitly, just set GCC_REQD unconditionally
-# rather than trying to limit by OS.
-GCC_REQD+= 4.4
-
-BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
+TOOL_DEPENDS+= yasm-[0-9]*:../../devel/yasm
.endif
REPLACE_BASH= configure
diff --git a/multimedia/libvpx/buildlink3.mk b/multimedia/libvpx/buildlink3.mk
index 93432c1854c..f93fcc40c53 100644
--- a/multimedia/libvpx/buildlink3.mk
+++ b/multimedia/libvpx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2017/01/16 23:45:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2020/10/25 12:43:45 nia Exp $
BUILDLINK_TREE+= libvpx
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.6.0
BUILDLINK_ABI_DEPENDS.libvpx+= libvpx>=1.6.1
BUILDLINK_PKGSRCDIR.libvpx?= ../../multimedia/libvpx
+GCC_REQD+= 4.8
+
.include "../../mk/pthread.buildlink3.mk"
.endif # LIBVPX_BUILDLINK3_MK