Bug 1507644 - Always enable wayland for artifact builds. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 16 Nov 2018 21:20:19 +0000
changeset 503287 01a4f2502443cc27d2092a4b46427d062f55a1ec
parent 503286 29ffc266326bffc33dfe8ba03b5c748627f65040
child 503288 38de1a06d48627afcfd4e40829bd99af2dd07bf3
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1507644
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1507644 - Always enable wayland for artifact builds. r=chmanchester Ideally, artifact builds would figure out the relevant buildconfig items that are set in the artifacts they download, such as MOZ_WAYLAND, MOZ_UPDATER, etc. In the meanwhile, since artifacts that are being downloaded have wayland support, we always set MOZ_WAYLAND when doing artifact builds. Depends on D12074 Differential Revision: https://phabricator.services.mozilla.com/D12075
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -207,16 +207,24 @@ add_old_configure_assignment('MOZ_X11', 
 
 # Wayland support
 # ==============================================================
 wayland_headers = pkg_check_modules(
     'MOZ_WAYLAND', 'gtk+-wayland-3.0 >= 3.10 xkbcommon >= 0.4.1',
     allow_missing=depends(full_toolkit)(lambda t: t == 'cairo-gtk3'),
     when=depends(full_toolkit)(lambda t: t in ('cairo-gtk3', 'cairo-gtk3-wayland')))
 
+
+@depends(wayland_headers, toolkit_gtk, artifact_builds)
+def wayland_headers(wayland, toolkit_gtk, artifacts):
+    if toolkit_gtk and artifacts:
+        return True
+    return wayland
+
+
 set_config('MOZ_WAYLAND', depends_if(wayland_headers)(lambda _: True))
 set_define('MOZ_WAYLAND', depends_if(wayland_headers)(lambda _: True))
 
 # GL Provider
 # ==============================================================
 option('--with-gl-provider', nargs=1, help='Set GL provider backend type')
 
 @depends('--with-gl-provider')