Bug 1506027 - Don't define MOZ_WIDGET_GTK to a numerical value. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 13 Nov 2018 23:16:59 +0000
changeset 502545 31306e519cf5bd31779cc859fad138f3ffe83c2e
parent 502544 93d3226434c23c02afee626f7c7e728b05fde2bd
child 502546 3d38289ea246a45c3aa71a409448c3040d640055
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)
reviewersmshal
bugs1506027
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 1506027 - Don't define MOZ_WIDGET_GTK to a numerical value. r=mshal And simplify related configure code a little. Depends on D11434 Differential Revision: https://phabricator.services.mozilla.com/D11435
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -188,29 +188,27 @@ def toolkit(toolkit):
     else:
         widget_toolkit = toolkit.replace('cairo-', '')
     return widget_toolkit
 
 set_config('MOZ_WIDGET_TOOLKIT', toolkit)
 add_old_configure_assignment('MOZ_WIDGET_TOOLKIT', toolkit)
 
 @depends(toolkit)
-def toolkit_gtk(toolkit):
+def toolkit_define(toolkit):
     if toolkit == 'gtk3':
-        return '3'
-
-set_define('MOZ_WIDGET_GTK', toolkit_gtk)
-
-@depends(toolkit)
-def toolkit_define(toolkit):
-    if toolkit not in ('gtk3', 'windows'):
+        toolkit = 'gtk'
+    if toolkit != 'windows':
         return 'MOZ_WIDGET_%s' % toolkit.upper()
 
 set_define(toolkit_define, True)
 
+@depends(toolkit)
+def toolkit_gtk(toolkit):
+    return toolkit == 'gtk3'
 
 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(