diff options
| author | gdt <gdt@pkgsrc.org> | 2019-12-22 14:33:58 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2019-12-22 14:33:58 +0000 |
| commit | faac204fc524ac16e2989e57a460c626d0ca5d53 (patch) | |
| tree | f1236bbf215ceb023caecde76c0114233c23a431 /www | |
| parent | 55051db27a4e6df31f8a7b5339c022c2c6d10efc (diff) | |
| download | pkgsrc-faac204fc524ac16e2989e57a460c626d0ca5d53.tar.gz | |
www/firefox68: Resolve pkg-build-options/not-bl3 issue
firefox68 tries to use pkg-build-options to find out if gtk3 was (or
will be) built with wayland, as that affects the PLIST. The current
code works for some and causes failures for others, including failures
of thunderbird. pkg-build-options insists on only being called from
bl3, but the use in Makefile (to manage PLIST changes) seems sensible.
This commit removes the use of pkg-build-options, resolving the build
issues on netbsd-8, and adds a default-off wayland option to firefox68
that merely adjusts the PLIST, so that people building firefox68 with
a wayland-enabled gtk3 have an easier time.
I don't believe that any default-option binary packages will change,
so no PKGREVISION++.
A proper fix is deferred until after the branch. This could involve
allowing pkg-build-options to be used in Makefile* instead of only
bl3, or adding wayland detection and setting some variable to gtk3's
bl3.
As discussed on pkgsrc-users and offlist with nia@.
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox68/mozilla-common.mk | 9 | ||||
| -rw-r--r-- | www/firefox68/options.mk | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk index 4e05195fdd9..40d6ceb5b72 100644 --- a/www/firefox68/mozilla-common.mk +++ b/www/firefox68/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.5 2019/12/08 20:09:41 nia Exp $ +# $NetBSD: mozilla-common.mk,v 1.6 2019/12/22 14:33:58 gdt Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -165,13 +165,6 @@ PLIST.tremor= yes PLIST.vorbis= yes .endif -.include "../../mk/pkg-build-options.mk" - -PLIST_VARS+= wayland -.if !empty(PKG_BUILD_OPTIONS.gtk3:Mwayland) -PLIST.wayland= 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 diff --git a/www/firefox68/options.mk b/www/firefox68/options.mk index e03d7aa1b45..332260757c6 100644 --- a/www/firefox68/options.mk +++ b/www/firefox68/options.mk @@ -1,10 +1,11 @@ -# $NetBSD: options.mk,v 1.2 2019/11/04 22:09:55 rillig Exp $ +# $NetBSD: options.mk,v 1.3 2019/12/22 14:33:58 gdt Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox PKG_SUPPORTED_OPTIONS= official-mozilla-branding PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus +#PKG_SUPPORTED_OPTIONS+= wayland PLIST_VARS+= gnome jemalloc debug .if ${OPSYS} == "Linux" @@ -100,3 +101,9 @@ PLIST.webrtc= yes .else CONFIGURE_ARGS+= --disable-webrtc .endif + +PLIST_VARS+= wayland +.if !empty(PKG_OPTIONS:Mwayland) +# \todo Instead of using an option, determine if gtk3 was built with wayland. +PLIST.wayland= yes +.endif |