summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authormartin <martin>2016-12-06 08:14:22 +0000
committermartin <martin>2016-12-06 08:14:22 +0000
commita8413884d16d0f9c21666f669ad2ede6d4b3a0c3 (patch)
tree6f932e4af1f2a0b0cbcf627e7e06aa7519d39f2d /www
parent8baf3c770be0294f8e0b90a8586a40c54fce87b2 (diff)
downloadpkgsrc-a8413884d16d0f9c21666f669ad2ede6d4b3a0c3.tar.gz
Mark libmozavcodec.so and libmozavutil.so as x86-only
Diffstat (limited to 'www')
-rw-r--r--www/firefox/PLIST6
-rw-r--r--www/firefox/mozilla-common.mk8
2 files changed, 9 insertions, 5 deletions
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 1b499847055..fb06583bea2 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.112 2016/12/03 09:58:25 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.113 2016/12/06 08:14:22 martin Exp $
bin/firefox
lib/firefox/application.ini
lib/firefox/browser/blocklist.xml
@@ -3419,8 +3419,8 @@ lib/firefox/hyphenation/hyph_sv.dic
lib/firefox/hyphenation/hyph_tr.dic
lib/firefox/hyphenation/hyph_uk.dic
lib/firefox/liblgpllibs.so
-lib/firefox/libmozavcodec.so
-lib/firefox/libmozavutil.so
+${PLIST.avx86}lib/firefox/libmozavcodec.so
+${PLIST.avx86}lib/firefox/libmozavutil.so
lib/firefox/libmozsqlite3.so
lib/firefox/libxul.so
lib/firefox/modules/AboutReader.jsm
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index c12c56ec876..0d7b05aee3f 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.83 2016/09/20 20:01:41 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.84 2016/12/06 08:14:22 martin Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -108,13 +108,17 @@ OBJDIR= ../build
CONFIGURE_DIRS= ${OBJDIR}
CONFIGURE_SCRIPT= ${WRKSRC}/configure
-PLIST_VARS+= sps vorbis tremor glskia throwwrapper mozglue
+PLIST_VARS+= sps vorbis tremor glskia throwwrapper mozglue avx86
.include "../../mk/endian.mk"
.if ${MACHINE_ENDIAN} == "little"
PLIST.glskia= yes
.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+PLIST.avx86= yes # see media/libav/README_MOZILLA: only used on x86
+.endif
+
.if ${MACHINE_ARCH} != "sparc64"
# For some reasons the configure test for GCC bug 26905 still triggers on
# sparc64, which makes mozilla skip the installation of a few wrapper headers.