Backed out changeset 3d38289ea246 (bug 1501218) for linux build bustages CLOSED TREE

build/moz.configure/pkg.configure

@@ -40,7 +40,6 @@ def pkg_check_modules(var, package_desc, when=always,
     if isinstance(package_desc, (tuple, list)):
         package_desc = ' '.join(package_desc)
     package_desc = dependable(package_desc)
-    allow_missing = dependable(allow_missing)
 
     @depends(when, '--enable-compile-environment')
     def when_and_compile_environment(when, compile_environment):
@@ -58,11 +57,11 @@ def pkg_check_modules(var, package_desc, when=always,
             die("*** Your version of pkg-config is too old. You need version %s or newer.",
                 min_version)
 
-    @depends(pkg_config, package_desc, allow_missing, when=when_and_compile_environment)
+    @depends(pkg_config, package_desc, when=when_and_compile_environment)
     @imports('subprocess')
     @imports('sys')
     @imports(_from='mozbuild.configure.util', _import='LineIO')
-    def package(pkg_config, package_desc, allow_missing):
+    def package(pkg_config, package_desc):
         # package_desc may start as a depends function, so we can't use
         # @checking here.
         log.info("checking for %s... " % package_desc)

toolkit/moz.configure

@@ -154,7 +154,7 @@ option('--enable-default-toolkit', nargs=1,
        help='Select default toolkit')
 
 @depends('--enable-default-toolkit', target, '--help')
-def full_toolkit(value, target, _):
+def toolkit(value, target, _):
     # Define possible choices for each platform. The default is the first one
     # listed when there are several.
     if target.os == 'WINNT':
@@ -177,7 +177,11 @@ def full_toolkit(value, target, _):
 
     return platform_choices[0]
 
-@depends(full_toolkit)
+@depends(toolkit)
+def wayland(toolkit):
+    return toolkit == 'cairo-gtk3-wayland'
+
+@depends(toolkit)
 def toolkit(toolkit):
     if toolkit == 'cairo-gtk3-wayland':
         widget_toolkit = 'gtk3'
@@ -208,9 +212,7 @@ add_old_configure_assignment('MOZ_X11', True, when=toolkit_gtk)
 # 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')))
+    'MOZ_WAYLAND', 'gtk+-wayland-3.0 >= 3.10 xkbcommon >= 0.4.1', when=wayland)
 
 set_config('MOZ_WAYLAND', depends_if(wayland_headers)(lambda _: True))
 set_define('MOZ_WAYLAND', depends_if(wayland_headers)(lambda _: True))
@@ -231,7 +233,7 @@ def gl_provider_define(provider):
 
 set_define('MOZ_GL_PROVIDER', gl_provider_define)
 
-@depends(gl_provider, wayland_headers, toolkit_gtk)
+@depends(gl_provider, wayland, toolkit_gtk)
 def gl_default_provider(value, wayland, toolkit_gtk):
     if value:
         return value