Bug 1496327 - Remove --without-x r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 04 Oct 2018 13:54:18 +0000
changeset 495460 ca4200ebd92b479740b2c379ef730d3b6ef20c16
parent 495459 d8d225f8204d0afacc288b12e12a62176ba9aa1c
child 495461 4b0eafbca6e86b5e1df7bab083b3d785dfb0f4cb
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1496327, 1282866
milestone64.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 1496327 - Remove --without-x r=froydnj Bug 1282866 removed the only configuration where it did something. Since then, using it only leads to a configure error. Differential Revision: https://phabricator.services.mozilla.com/D7691
build/moz.configure/util.configure
toolkit/moz.configure
--- a/build/moz.configure/util.configure
+++ b/build/moz.configure/util.configure
@@ -464,21 +464,21 @@ def old_configure_assignments():
 
 
 @dependable
 def extra_old_configure_args():
     return []
 
 
 @template
-def add_old_configure_assignment(var, value):
+def add_old_configure_assignment(var, value, when=None):
     var = dependable(var)
     value = dependable(value)
 
-    @depends(old_configure_assignments, var, value)
+    @depends(old_configure_assignments, var, value, when=when)
     @imports(_from='mozbuild.shellutil', _import='quote')
     def add_assignment(assignments, var, value):
         if var is None or value is None:
             return
         if value is True:
             assignments.append('%s=1' % var)
         elif value is False:
             assignments.append('%s=' % var)
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -198,35 +198,21 @@ set_define('MOZ_WIDGET_GTK', toolkit_gtk
 @depends(toolkit)
 def toolkit_define(toolkit):
     if toolkit not in ('gtk3', 'windows'):
         return 'MOZ_WIDGET_%s' % toolkit.upper()
 
 set_define(toolkit_define, True)
 
 
-option('--without-x', env='WITHOUT_X', help='Disable X11 support')
-
-@depends('--without-x', toolkit)
-def x11(value, toolkit):
-    if not value:
-        die('--without-x is not supported')
-
-    x11_toolkits = ('gtk3',)
-    if value and value.origin != 'default' and toolkit not in x11_toolkits:
-        die('--with-x is only valid with --enable-default-toolkit={%s}',
-            ','.join(x11_toolkits))
-
-    return True if value and toolkit in x11_toolkits else None
-
-set_config('MOZ_ENABLE_XREMOTE', x11)
-set_define('MOZ_ENABLE_XREMOTE', x11)
-set_config('MOZ_X11', x11)
-set_define('MOZ_X11', x11)
-add_old_configure_assignment('MOZ_X11', x11)
+set_config('MOZ_ENABLE_XREMOTE', True, when=toolkit_gtk)
+set_define('MOZ_ENABLE_XREMOTE', True, when=toolkit_gtk)
+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.22',
                                     when=wayland)
 
 set_config('MOZ_WAYLAND', depends_if(wayland_headers)(lambda _: True))
 set_define('MOZ_WAYLAND', depends_if(wayland_headers)(lambda _: True))
@@ -242,23 +228,23 @@ 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, x11)
-def gl_default_provider(value, wayland, x11):
+@depends(gl_provider, wayland, toolkit_gtk)
+def gl_default_provider(value, wayland, toolkit_gtk):
     if value:
         return value
     elif wayland:
         return 'EGL'
-    elif x11:
+    elif toolkit_gtk:
         return 'GLX'
 
 set_config('MOZ_GL_PROVIDER', gl_provider)
 set_config('MOZ_GL_DEFAULT_PROVIDER', gl_default_provider)
 
 @depends(gl_default_provider)
 def gl_provider_define(provider):
     if provider: