Backed out changeset 3d38289ea246 (bug 1501218) for linux build bustages CLOSED TREE
authorBogdan Tara <btara@mozilla.com>
Wed, 14 Nov 2018 01:58:20 +0200
changeset 502548 91ef9daa39b6b99754389139914d3c2566bad123
parent 502547 4e24a409bacbdc1ecf4ae85994bf65df45571f58
child 502549 2a37c67f14f26b10b15efb89dacc6ba15fc7d19f
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)
bugs1501218
milestone65.0a1
backs out3d38289ea246a45c3aa71a409448c3040d640055
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
Backed out changeset 3d38289ea246 (bug 1501218) for linux build bustages CLOSED TREE
build/moz.configure/pkg.configure
toolkit/moz.configure
--- a/build/moz.configure/pkg.configure
+++ b/build/moz.configure/pkg.configure
@@ -35,17 +35,16 @@ def pkg_config_version(pkg_config):
 
 
 @template
 def pkg_check_modules(var, package_desc, when=always,
                       allow_missing=False):
     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):
         return when and compile_environment
 
     @depends(pkg_config, pkg_config_version,
              when=when_and_compile_environment)
     def check_pkg_config(pkg_config, version):
@@ -53,21 +52,21 @@ def pkg_check_modules(var, package_desc,
         if pkg_config is None:
             die("*** The pkg-config script could not be found. Make sure it is\n"
                 "*** in your path, or set the PKG_CONFIG environment variable\n"
                 "*** to the full path to pkg-config.")
         if version < min_version:
             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)
         with log.queue_debug():
             try:
                 subprocess.check_output([pkg_config, '--errors-to-stdout',
                                          '--print-errors', package_desc])
                 log.info("yes")
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -149,17 +149,17 @@ set_config('L10NBASEDIR', l10n_base)
 # `choices` depending on the target, but that doesn't pan out for the same
 # reason.
 option('--enable-default-toolkit', nargs=1,
        choices=('cairo-windows', 'cairo-gtk3', 'cairo-gtk3-wayland',
                 'cairo-cocoa', 'cairo-uikit', 'cairo-android'),
        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':
         platform_choices = ('cairo-windows',)
     elif target.os == 'OSX':
         platform_choices = ('cairo-cocoa',)
     elif target.os == 'iOS':
         platform_choices = ('cairo-uikit',)
@@ -172,17 +172,21 @@ def full_toolkit(value, target, _):
         if value[0] not in platform_choices:
             die('`%s` is not a valid value for --enable-default-toolkit on %s\n'
                 'Valid values: %s', value[0], target.os,
                 ', '.join(platform_choices))
         return value[0]
 
     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'
     else:
         widget_toolkit = toolkit.replace('cairo-', '')
     return widget_toolkit
 
 set_config('MOZ_WIDGET_TOOLKIT', toolkit)
@@ -203,19 +207,17 @@ def toolkit_gtk(toolkit):
 
 set_config('MOZ_X11', True, when=toolkit_gtk)
 set_define('MOZ_X11', True, when=toolkit_gtk)
 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))
 
 # GL Provider
 # ==============================================================
 option('--with-gl-provider', nargs=1, help='Set GL provider backend type')
 
@@ -226,17 +228,17 @@ def gl_provider(value):
 
 @depends(gl_provider)
 def gl_provider_define(provider):
     if provider:
         return 'GLContextProvider%s' % 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
     elif wayland:
         return 'EGL'
     elif toolkit_gtk:
         return 'GLX'