firefox52: clean up some pkglint problems.

This commit is contained in:
nia 2020-11-11 11:11:30 +00:00
parent 9ec8dc7d46
commit f1953398aa
2 changed files with 4 additions and 35 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: mozilla-common.mk,v 1.8 2020/06/04 13:47:19 nia Exp $
# $NetBSD: mozilla-common.mk,v 1.9 2020/11/11 11:11:30 nia Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@ -101,40 +101,12 @@ OBJDIR= ../build
CONFIGURE_DIRS= ${OBJDIR}
CONFIGURE_SCRIPT= ${WRKSRC}/configure
PLIST_VARS+= sps vorbis tremor glskia throwwrapper mozglue avx86
.include "../../mk/endian.mk"
.if ${MACHINE_ENDIAN} == "little"
PLIST.glskia= yes
.endif
PLIST_VARS+= avx86
.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.
# Other archs end up with one additional file in the SDK headers
PLIST.throwwrapper= yes
.endif
.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*)
PLIST.sps= yes
.endif
.if !empty(MACHINE_PLATFORM:MLinux-*-arm*)
PLIST.tremor= yes
.else
PLIST.vorbis= yes
.endif
# See ${WRKSRC}/mozglue/build/moz.build: libmozglue is built and
# installed as a shared library on these platforms.
.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" # or Android
PLIST.mozglue= yes
.endif
# See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing
# support is only available when the toolkit is cairo-cocoa.
CONFIGURE_ARGS.Darwin+= --disable-sandbox
@ -179,14 +151,12 @@ BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
BUILDLINK_API_DEPENDS.nspr+= nspr>=4.12
.include "../../devel/nspr/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
BUILDLINK_API_DEPENDS.nss+= nss>=3.28.1
.include "../../devel/nss/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
.include "../../graphics/cairo/buildlink3.mk"
BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
.include "../../multimedia/libvpx/buildlink3.mk"
.include "../../net/libIDL/buildlink3.mk"
.include "../../textproc/hunspell/buildlink3.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.5 2020/06/04 13:47:19 nia Exp $
# $NetBSD: options.mk,v 1.6 2020/11/11 11:11:30 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS= gtk3
PKG_SUPPORTED_OPTIONS= official-mozilla-branding
PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus
PLIST_VARS+= jemalloc debug
PLIST_VARS+= debug
.if ${OPSYS} == "Linux"
PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus
@ -58,7 +58,6 @@ CONFIGURE_ARGS+= --with-oss
.endif
.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
PLIST.jemalloc= yes
CONFIGURE_ARGS+= --enable-jemalloc
CONFIGURE_ARGS+= --enable-replace-malloc
.else